summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2017-11-14 11:39:22 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-04 17:24:00 +0000
commitf04d6842d3b3e133e1cf19abdff2cc9d6d1cfdc9 (patch)
tree6175b39f28ff62f0e25e8a713473813bff8fb7b7 /meta
parentc889bffda23d9fdc0133b61c725e3d4c20b9aad9 (diff)
downloadpoky-f04d6842d3b3e133e1cf19abdff2cc9d6d1cfdc9.tar.gz
systemd: sort PACKAGECONFIG options
Also fix some minor formatting inconsistencies (extra spaces or commas etc). No functional changes. (From OE-Core rev: 1f3928e9027ed35c562db76e0e936a4b89e3fbdd) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> (cherry picked from commit 4caf480c8d824575e970ec8ba15e4ee221166954) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/systemd/systemd_234.bb78
1 files changed, 39 insertions, 39 deletions
diff --git a/meta/recipes-core/systemd/systemd_234.bb b/meta/recipes-core/systemd/systemd_234.bb
index b7968b15aa..1e2377a49f 100644
--- a/meta/recipes-core/systemd/systemd_234.bb
+++ b/meta/recipes-core/systemd/systemd_234.bb
@@ -95,59 +95,59 @@ PACKAGECONFIG_remove_libc-musl = " \
95# systemd-serialgetty.bb - not enabled by default. 95# systemd-serialgetty.bb - not enabled by default.
96PACKAGECONFIG[serial-getty-generator] = "" 96PACKAGECONFIG[serial-getty-generator] = ""
97 97
98PACKAGECONFIG[journal-upload] = "--enable-libcurl,--disable-libcurl,curl" 98PACKAGECONFIG[audit] = "--enable-audit,--disable-audit,audit"
99# Sign the journal for anti-tampering 99PACKAGECONFIG[backlight] = "--enable-backlight,--disable-backlight"
100PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt" 100PACKAGECONFIG[binfmt] = "--enable-binfmt,--disable-binfmt"
101PACKAGECONFIG[bzip2] = "--enable-bzip2,--disable-bzip2,bzip2"
102PACKAGECONFIG[coredump] = "--enable-coredump,--disable-coredump"
101PACKAGECONFIG[cryptsetup] = "--enable-libcryptsetup,--disable-libcryptsetup,cryptsetup" 103PACKAGECONFIG[cryptsetup] = "--enable-libcryptsetup,--disable-libcryptsetup,cryptsetup"
102PACKAGECONFIG[microhttpd] = "--enable-microhttpd,--disable-microhttpd,libmicrohttpd" 104PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
105PACKAGECONFIG[efi] = "--enable-efi,--disable-efi"
103PACKAGECONFIG[elfutils] = "--enable-elfutils,--disable-elfutils,elfutils" 106PACKAGECONFIG[elfutils] = "--enable-elfutils,--disable-elfutils,elfutils"
104PACKAGECONFIG[resolved] = "--enable-resolved,--disable-resolved" 107PACKAGECONFIG[firstboot] = "--enable-firstboot,--disable-firstboot"
105PACKAGECONFIG[networkd] = "--enable-networkd,--disable-networkd" 108# Sign the journal for anti-tampering
106PACKAGECONFIG[machined] = "--enable-machined,--disable-machined" 109PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt"
107PACKAGECONFIG[backlight] = "--enable-backlight,--disable-backlight" 110PACKAGECONFIG[hibernate] = "--enable-hibernate,--disable-hibernate"
108PACKAGECONFIG[vconsole] = "--enable-vconsole,--disable-vconsole,,${PN}-vconsole-setup"
109PACKAGECONFIG[quotacheck] = "--enable-quotacheck,--disable-quotacheck"
110PACKAGECONFIG[hostnamed] = "--enable-hostnamed,--disable-hostnamed" 111PACKAGECONFIG[hostnamed] = "--enable-hostnamed,--disable-hostnamed"
112PACKAGECONFIG[ima] = "--enable-ima,--disable-ima"
113# importd requires curl/xz/zlib/bzip2/gcrypt
114PACKAGECONFIG[importd] = "--enable-importd,--disable-importd"
115# Update NAT firewall rules
116PACKAGECONFIG[iptc] = "--enable-libiptc,--disable-libiptc,iptables"
117PACKAGECONFIG[journal-upload] = "--enable-libcurl,--disable-libcurl,curl"
118PACKAGECONFIG[ldconfig] = "--enable-ldconfig,--disable-ldconfig"
119PACKAGECONFIG[libidn] = "--enable-libidn,--disable-libidn,libidn"
120PACKAGECONFIG[localed] = "--enable-localed,--disable-localed"
121PACKAGECONFIG[logind] = "--enable-logind,--disable-logind"
122PACKAGECONFIG[lz4] = "--enable-lz4,--disable-lz4,lz4"
123PACKAGECONFIG[machined] = "--enable-machined,--disable-machined"
124PACKAGECONFIG[manpages] = "--enable-manpages,--disable-manpages,libxslt-native xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
125PACKAGECONFIG[microhttpd] = "--enable-microhttpd,--disable-microhttpd,libmicrohttpd"
111PACKAGECONFIG[myhostname] = "--enable-myhostname,--disable-myhostname" 126PACKAGECONFIG[myhostname] = "--enable-myhostname,--disable-myhostname"
127PACKAGECONFIG[networkd] = "--enable-networkd,--disable-networkd"
112PACKAGECONFIG[nss] = "--enable-nss-systemd,--disable-nss-systemd" 128PACKAGECONFIG[nss] = "--enable-nss-systemd,--disable-nss-systemd"
129PACKAGECONFIG[pam] = "--enable-pam,--disable-pam,libpam,${PAM_PLUGINS}"
130PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit"
131PACKAGECONFIG[qrencode] = "--enable-qrencode,--disable-qrencode,qrencode"
132PACKAGECONFIG[quotacheck] = "--enable-quotacheck,--disable-quotacheck"
133PACKAGECONFIG[randomseed] = "--enable-randomseed,--disable-randomseed"
134PACKAGECONFIG[resolved] = "--enable-resolved,--disable-resolved"
113PACKAGECONFIG[rfkill] = "--enable-rfkill,--disable-rfkill" 135PACKAGECONFIG[rfkill] = "--enable-rfkill,--disable-rfkill"
114PACKAGECONFIG[hibernate] = "--enable-hibernate,--disable-hibernate"
115PACKAGECONFIG[timedated] = "--enable-timedated,--disable-timedated"
116PACKAGECONFIG[timesyncd] = "--enable-timesyncd,--disable-timesyncd"
117PACKAGECONFIG[localed] = "--enable-localed,--disable-localed"
118PACKAGECONFIG[efi] = "--enable-efi,--disable-efi"
119PACKAGECONFIG[ima] = "--enable-ima,--disable-ima"
120PACKAGECONFIG[smack] = "--enable-smack,--disable-smack"
121# libseccomp is found in meta-security 136# libseccomp is found in meta-security
122PACKAGECONFIG[seccomp] = "--enable-seccomp,--disable-seccomp,libseccomp" 137PACKAGECONFIG[seccomp] = "--enable-seccomp,--disable-seccomp,libseccomp"
123PACKAGECONFIG[logind] = "--enable-logind,--disable-logind" 138PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,initscripts-sushell"
139PACKAGECONFIG[smack] = "--enable-smack,--disable-smack"
124PACKAGECONFIG[sysusers] = "--enable-sysusers,--disable-sysusers" 140PACKAGECONFIG[sysusers] = "--enable-sysusers,--disable-sysusers"
125PACKAGECONFIG[firstboot] = "--enable-firstboot,--disable-firstboot" 141PACKAGECONFIG[timedated] = "--enable-timedated,--disable-timedated"
126PACKAGECONFIG[randomseed] = "--enable-randomseed,--disable-randomseed" 142PACKAGECONFIG[timesyncd] = "--enable-timesyncd,--disable-timesyncd"
127PACKAGECONFIG[binfmt] = "--enable-binfmt,--disable-binfmt" 143PACKAGECONFIG[usrmerge] = "--disable-split-usr,--enable-split-usr"
128PACKAGECONFIG[utmp] = "--enable-utmp,--disable-utmp" 144PACKAGECONFIG[utmp] = "--enable-utmp,--disable-utmp"
129PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit" 145PACKAGECONFIG[valgrind] = "ac_cv_header_valgrind_memcheck_h=yes ac_cv_header_valgrind_valgrind_h=yes,ac_cv_header_valgrind_memcheck_h=no ac_cv_header_valgrind_valgrind_h=no,valgrind"
130# importd requires curl/xz/zlib/bzip2/gcrypt 146PACKAGECONFIG[vconsole] = "--enable-vconsole,--disable-vconsole,,${PN}-vconsole-setup"
131PACKAGECONFIG[importd] = "--enable-importd,--disable-importd"
132PACKAGECONFIG[libidn] = "--enable-libidn,--disable-libidn,libidn"
133PACKAGECONFIG[audit] = "--enable-audit,--disable-audit,audit"
134PACKAGECONFIG[manpages] = "--enable-manpages,--disable-manpages,libxslt-native xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
135PACKAGECONFIG[pam] = "--enable-pam,--disable-pam,libpam,${PAM_PLUGINS}"
136# Verify keymaps on locale change 147# Verify keymaps on locale change
137PACKAGECONFIG[xkbcommon] = "--enable-xkbcommon,--disable-xkbcommon,libxkbcommon" 148PACKAGECONFIG[xkbcommon] = "--enable-xkbcommon,--disable-xkbcommon,libxkbcommon"
138# Update NAT firewall rules
139PACKAGECONFIG[iptc] = "--enable-libiptc,--disable-libiptc,iptables"
140PACKAGECONFIG[ldconfig] = "--enable-ldconfig,--disable-ldconfig,,"
141PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,initscripts-sushell"
142PACKAGECONFIG[valgrind] = "ac_cv_header_valgrind_memcheck_h=yes ac_cv_header_valgrind_valgrind_h=yes ,ac_cv_header_valgrind_memcheck_h=no ac_cv_header_valgrind_valgrind_h=no ,valgrind"
143PACKAGECONFIG[qrencode] = "--enable-qrencode,--disable-qrencode,qrencode"
144PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
145PACKAGECONFIG[coredump] = "--enable-coredump,--disable-coredump"
146PACKAGECONFIG[bzip2] = "--enable-bzip2,--disable-bzip2,bzip2"
147PACKAGECONFIG[lz4] = "--enable-lz4,--disable-lz4,lz4"
148PACKAGECONFIG[xz] = "--enable-xz,--disable-xz,xz" 149PACKAGECONFIG[xz] = "--enable-xz,--disable-xz,xz"
149PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib" 150PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib"
150PACKAGECONFIG[usrmerge] = "--disable-split-usr, --enable-split-usr"
151 151
152CACHED_CONFIGUREVARS += "ac_cv_path_KILL=${base_bindir}/kill" 152CACHED_CONFIGUREVARS += "ac_cv_path_KILL=${base_bindir}/kill"
153CACHED_CONFIGUREVARS += "ac_cv_path_KMOD=${base_bindir}/kmod" 153CACHED_CONFIGUREVARS += "ac_cv_path_KMOD=${base_bindir}/kmod"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-04-30 22:51:48 +0000