Mercurial > vanilla
annotate graphics/weston/musl.patch @ 586:1218a8f753b6
core/busybox: let's re-add /etc/inittab support
While busybox has weird /etc/inittab support the predefined actions without it
are too minimalistic so re-add the support for it but don't install an
/etc/inittab file.
The file /etc/inittab file is still installed with sysvinit but if someone wants
to use busybox's init it should create its own /etc/inittab file with the
busybox syntax and do not install sysvinit afterwards.
author | David Demelier <markand@malikania.fr> |
---|---|
date | Mon, 08 Jul 2019 20:35:00 +0200 |
parents | 7828241c9634 |
children |
rev | line source |
---|---|
505
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
1 diff --git a/Makefile.am b/Makefile.am |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
2 index 5407b593ebb951031e79a70dda3b7dd555d1c8a9..5c6a051914a03ebe531e9c9a90b5cd199988a9a4 100644 |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
3 --- a/Makefile.am |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
4 +++ b/Makefile.am |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
5 @@ -230,6 +230,7 @@ libsession_helper_la_SOURCES = \ |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
6 libweston/launcher-util.c \ |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
7 libweston/launcher-util.h \ |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
8 libweston/launcher-impl.h \ |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
9 + libweston/weston-error.h \ |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
10 libweston/weston-launch.h \ |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
11 libweston/launcher-weston-launch.c \ |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
12 libweston/launcher-direct.c |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
13 diff --git a/configure.ac b/configure.ac |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
14 index c05ad01160040a0cb30d153858bbf0247f183a57..8cfec6871e5c2c9ac0df390b47c9d22ecea88ba4 100644 |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
15 --- a/configure.ac |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
16 +++ b/configure.ac |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
17 @@ -126,6 +126,7 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[], |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
18 [AC_MSG_ERROR("CLOCK_MONOTONIC is needed to compile weston")], |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
19 [[#include <time.h>]]) |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
20 |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
21 +AC_CHECK_HEADERS([error.h]) |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
22 AC_CHECK_FUNCS([mkostemp strchrnul initgroups posix_fallocate]) |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
23 |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
24 # check for libdrm as a build-time dependency only |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
25 diff --git a/libweston/weston-error.h b/libweston/weston-error.h |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
26 new file mode 100644 |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
27 index 0000000000000000000000000000000000000000..bc7b95bda0a1772664d78119255b2e966cab8a15 |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
28 --- /dev/null |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
29 +++ b/libweston/weston-error.h |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
30 @@ -0,0 +1,22 @@ |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
31 +#ifndef _WESTON_ERROR_H |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
32 +#define _WESTON_ERROR_H |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
33 + |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
34 +#if defined(HAVE_ERROR_H) |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
35 +#include <error.h> |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
36 +#else |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
37 +#include <string.h> |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
38 +#define _weston_error(S, E, F, ...) do { \ |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
39 + if (E) { \ |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
40 + printf("\n"); \ |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
41 + fprintf(stderr, F ": %s", ##__VA_ARGS__, strerror(E)); \ |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
42 + exit(S); \ |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
43 + } else { \ |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
44 + printf("\n"); \ |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
45 + fprintf(stderr, F, ##__VA_ARGS__); \ |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
46 + exit(S); }\ |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
47 +} while(0) |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
48 + |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
49 +#define error _weston_error |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
50 +#endif |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
51 + |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
52 +#endif |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
53 diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
54 index bf73e0d616a0d0efc228909c48bcb6b3ad6660ca..90644394309f3ee7e33bc7fafc2f3150f0a8d2b3 100644 |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
55 --- a/libweston/weston-launch.c |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
56 +++ b/libweston/weston-launch.c |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
57 @@ -33,7 +33,6 @@ |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
58 #include <poll.h> |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
59 #include <errno.h> |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
60 |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
61 -#include <error.h> |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
62 #include <getopt.h> |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
63 |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
64 #include <sys/types.h> |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
65 @@ -59,6 +58,7 @@ |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
66 #endif |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
67 |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
68 #include "weston-launch.h" |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
69 +#include "weston-error.h" |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
70 |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
71 #define DRM_MAJOR 226 |
7828241c9634
graphics: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
72 |