* [PATCH 0/6] systemd: misc recipe cleanup
@ 2017-11-14 19:39 Andre McCurdy
2017-11-14 19:39 ` [PATCH 1/6] tclibc-musl.inc: disable ldconfig distro feature Andre McCurdy
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: Andre McCurdy @ 2017-11-14 19:39 UTC (permalink / raw)
To: openembedded-core
Andre McCurdy (6):
tclibc-musl.inc: disable ldconfig distro feature
systemd: remove musl specific control of ldconfig PACKAGECONFIG
systemd: use consistent approach for musl PACKAGECONFIG options
systemd: sort PACKAGECONFIG options
systemd: use consistent indenting and coding style in do_install()
systemd: fix duplication of CACHED_CONFIGUREVARS
meta/conf/distro/include/tclibc-musl.inc | 2 +
meta/recipes-core/systemd/systemd_234.bb | 239 ++++++++++++++++---------------
2 files changed, 124 insertions(+), 117 deletions(-)
--
1.9.1
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 1/6] tclibc-musl.inc: disable ldconfig distro feature 2017-11-14 19:39 [PATCH 0/6] systemd: misc recipe cleanup Andre McCurdy @ 2017-11-14 19:39 ` Andre McCurdy 2017-11-14 19:39 ` [PATCH 2/6] systemd: remove musl specific control of ldconfig PACKAGECONFIG Andre McCurdy ` (4 subsequent siblings) 5 siblings, 0 replies; 7+ messages in thread From: Andre McCurdy @ 2017-11-14 19:39 UTC (permalink / raw) To: openembedded-core Musl has no support for ldconfig, so ensure that the corresponding distro feature is disabled when building with musl. Signed-off-by: Andre McCurdy <armccurdy@gmail.com> --- meta/conf/distro/include/tclibc-musl.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/conf/distro/include/tclibc-musl.inc b/meta/conf/distro/include/tclibc-musl.inc index 3d3f6ac..9ae2a93 100644 --- a/meta/conf/distro/include/tclibc-musl.inc +++ b/meta/conf/distro/include/tclibc-musl.inc @@ -14,6 +14,8 @@ PREFERRED_PROVIDER_virtual/libintl ?= "musl" PREFERRED_PROVIDER_virtual/nativesdk-libintl ?= "nativesdk-glibc" PREFERRED_PROVIDER_virtual/nativesdk-libiconv ?= "nativesdk-glibc" +DISTRO_FEATURES_BACKFILL_CONSIDERED += "ldconfig" + #USE_NLS ?= "no" CXXFLAGS += "-fvisibility-inlines-hidden" -- 1.9.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/6] systemd: remove musl specific control of ldconfig PACKAGECONFIG 2017-11-14 19:39 [PATCH 0/6] systemd: misc recipe cleanup Andre McCurdy 2017-11-14 19:39 ` [PATCH 1/6] tclibc-musl.inc: disable ldconfig distro feature Andre McCurdy @ 2017-11-14 19:39 ` Andre McCurdy 2017-11-14 19:39 ` [PATCH 3/6] systemd: use consistent approach for musl PACKAGECONFIG options Andre McCurdy ` (3 subsequent siblings) 5 siblings, 0 replies; 7+ messages in thread From: Andre McCurdy @ 2017-11-14 19:39 UTC (permalink / raw) To: openembedded-core The ldconfig PACKAGECONFIG option is controlled by the ldconfig distro feature - which is now disabled by default when building for musl. Signed-off-by: Andre McCurdy <armccurdy@gmail.com> --- meta/recipes-core/systemd/systemd_234.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/recipes-core/systemd/systemd_234.bb b/meta/recipes-core/systemd/systemd_234.bb index 6b8745b..6946538 100644 --- a/meta/recipes-core/systemd/systemd_234.bb +++ b/meta/recipes-core/systemd/systemd_234.bb @@ -80,7 +80,6 @@ PACKAGECONFIG_remove_libc-musl = "smack" PACKAGECONFIG_remove_libc-musl = "resolved" PACKAGECONFIG_remove_libc-musl = "nss" PACKAGECONFIG_remove_libc-musl = "localed" -PACKAGECONFIG_remove_libc-musl = "ldconfig" # Use the upstream systemd serial-getty@.service and rely on # systemd-getty-generator instead of using the OE-core specific -- 1.9.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/6] systemd: use consistent approach for musl PACKAGECONFIG options 2017-11-14 19:39 [PATCH 0/6] systemd: misc recipe cleanup Andre McCurdy 2017-11-14 19:39 ` [PATCH 1/6] tclibc-musl.inc: disable ldconfig distro feature Andre McCurdy 2017-11-14 19:39 ` [PATCH 2/6] systemd: remove musl specific control of ldconfig PACKAGECONFIG Andre McCurdy @ 2017-11-14 19:39 ` Andre McCurdy 2017-11-14 19:39 ` [PATCH 4/6] systemd: sort " Andre McCurdy ` (2 subsequent siblings) 5 siblings, 0 replies; 7+ messages in thread From: Andre McCurdy @ 2017-11-14 19:39 UTC (permalink / raw) To: openembedded-core Consistently use PACKAGECONFIG_remove_libc-musl to disable options which are not compatible with musl. Also sort the default PACKAGECONFIG list. Signed-off-by: Andre McCurdy <armccurdy@gmail.com> --- meta/recipes-core/systemd/systemd_234.bb | 67 ++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 29 deletions(-) diff --git a/meta/recipes-core/systemd/systemd_234.bb b/meta/recipes-core/systemd/systemd_234.bb index 6946538..b7968b1 100644 --- a/meta/recipes-core/systemd/systemd_234.bb +++ b/meta/recipes-core/systemd/systemd_234.bb @@ -50,36 +50,45 @@ PAM_PLUGINS = " \ pam-plugin-keyinit \ " -PACKAGECONFIG ??= "xz \ - ${@bb.utils.filter('DISTRO_FEATURES', 'efi pam selinux ldconfig usrmerge', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'rfkill', '', d)} \ - binfmt \ - randomseed \ - machined \ - backlight \ - vconsole \ - quotacheck \ - hostnamed \ - ${@bb.utils.contains('TCLIBC', 'glibc', 'myhostname sysusers utmp', '', d)} \ - nss \ - hibernate \ - timedated \ - timesyncd \ - localed \ - ima \ - smack \ - logind \ - firstboot \ - polkit \ - resolved \ - networkd \ +PACKAGECONFIG ??= " \ + ${@bb.utils.filter('DISTRO_FEATURES', 'efi ldconfig pam selinux usrmerge', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'rfkill', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \ + backlight \ + binfmt \ + firstboot \ + hibernate \ + hostnamed \ + ima \ + localed \ + logind \ + machined \ + myhostname \ + networkd \ + nss \ + polkit \ + quotacheck \ + randomseed \ + resolved \ + smack \ + sysusers \ + timedated \ + timesyncd \ + utmp \ + vconsole \ + xz \ +" + +PACKAGECONFIG_remove_libc-musl = " \ + localed \ + myhostname \ + nss \ + resolved \ + selinux \ + smack \ + sysusers \ + utmp \ " -PACKAGECONFIG_remove_libc-musl = "selinux" -PACKAGECONFIG_remove_libc-musl = "smack" -PACKAGECONFIG_remove_libc-musl = "resolved" -PACKAGECONFIG_remove_libc-musl = "nss" -PACKAGECONFIG_remove_libc-musl = "localed" # Use the upstream systemd serial-getty@.service and rely on # systemd-getty-generator instead of using the OE-core specific -- 1.9.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 4/6] systemd: sort PACKAGECONFIG options 2017-11-14 19:39 [PATCH 0/6] systemd: misc recipe cleanup Andre McCurdy ` (2 preceding siblings ...) 2017-11-14 19:39 ` [PATCH 3/6] systemd: use consistent approach for musl PACKAGECONFIG options Andre McCurdy @ 2017-11-14 19:39 ` Andre McCurdy 2017-11-14 19:39 ` [PATCH 5/6] systemd: use consistent indenting and coding style in do_install() Andre McCurdy 2017-11-14 19:39 ` [PATCH 6/6] systemd: fix duplication of CACHED_CONFIGUREVARS Andre McCurdy 5 siblings, 0 replies; 7+ messages in thread From: Andre McCurdy @ 2017-11-14 19:39 UTC (permalink / raw) To: openembedded-core Also fix some minor formatting inconsistencies (extra spaces or commas etc). No functional changes. Signed-off-by: Andre McCurdy <armccurdy@gmail.com> --- meta/recipes-core/systemd/systemd_234.bb | 78 ++++++++++++++++---------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/meta/recipes-core/systemd/systemd_234.bb b/meta/recipes-core/systemd/systemd_234.bb index b7968b1..1e2377a 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 = " \ # systemd-serialgetty.bb - not enabled by default. PACKAGECONFIG[serial-getty-generator] = "" -PACKAGECONFIG[journal-upload] = "--enable-libcurl,--disable-libcurl,curl" -# Sign the journal for anti-tampering -PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt" +PACKAGECONFIG[audit] = "--enable-audit,--disable-audit,audit" +PACKAGECONFIG[backlight] = "--enable-backlight,--disable-backlight" +PACKAGECONFIG[binfmt] = "--enable-binfmt,--disable-binfmt" +PACKAGECONFIG[bzip2] = "--enable-bzip2,--disable-bzip2,bzip2" +PACKAGECONFIG[coredump] = "--enable-coredump,--disable-coredump" PACKAGECONFIG[cryptsetup] = "--enable-libcryptsetup,--disable-libcryptsetup,cryptsetup" -PACKAGECONFIG[microhttpd] = "--enable-microhttpd,--disable-microhttpd,libmicrohttpd" +PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" +PACKAGECONFIG[efi] = "--enable-efi,--disable-efi" PACKAGECONFIG[elfutils] = "--enable-elfutils,--disable-elfutils,elfutils" -PACKAGECONFIG[resolved] = "--enable-resolved,--disable-resolved" -PACKAGECONFIG[networkd] = "--enable-networkd,--disable-networkd" -PACKAGECONFIG[machined] = "--enable-machined,--disable-machined" -PACKAGECONFIG[backlight] = "--enable-backlight,--disable-backlight" -PACKAGECONFIG[vconsole] = "--enable-vconsole,--disable-vconsole,,${PN}-vconsole-setup" -PACKAGECONFIG[quotacheck] = "--enable-quotacheck,--disable-quotacheck" +PACKAGECONFIG[firstboot] = "--enable-firstboot,--disable-firstboot" +# Sign the journal for anti-tampering +PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt" +PACKAGECONFIG[hibernate] = "--enable-hibernate,--disable-hibernate" PACKAGECONFIG[hostnamed] = "--enable-hostnamed,--disable-hostnamed" +PACKAGECONFIG[ima] = "--enable-ima,--disable-ima" +# importd requires curl/xz/zlib/bzip2/gcrypt +PACKAGECONFIG[importd] = "--enable-importd,--disable-importd" +# Update NAT firewall rules +PACKAGECONFIG[iptc] = "--enable-libiptc,--disable-libiptc,iptables" +PACKAGECONFIG[journal-upload] = "--enable-libcurl,--disable-libcurl,curl" +PACKAGECONFIG[ldconfig] = "--enable-ldconfig,--disable-ldconfig" +PACKAGECONFIG[libidn] = "--enable-libidn,--disable-libidn,libidn" +PACKAGECONFIG[localed] = "--enable-localed,--disable-localed" +PACKAGECONFIG[logind] = "--enable-logind,--disable-logind" +PACKAGECONFIG[lz4] = "--enable-lz4,--disable-lz4,lz4" +PACKAGECONFIG[machined] = "--enable-machined,--disable-machined" +PACKAGECONFIG[manpages] = "--enable-manpages,--disable-manpages,libxslt-native xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" +PACKAGECONFIG[microhttpd] = "--enable-microhttpd,--disable-microhttpd,libmicrohttpd" PACKAGECONFIG[myhostname] = "--enable-myhostname,--disable-myhostname" +PACKAGECONFIG[networkd] = "--enable-networkd,--disable-networkd" PACKAGECONFIG[nss] = "--enable-nss-systemd,--disable-nss-systemd" +PACKAGECONFIG[pam] = "--enable-pam,--disable-pam,libpam,${PAM_PLUGINS}" +PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit" +PACKAGECONFIG[qrencode] = "--enable-qrencode,--disable-qrencode,qrencode" +PACKAGECONFIG[quotacheck] = "--enable-quotacheck,--disable-quotacheck" +PACKAGECONFIG[randomseed] = "--enable-randomseed,--disable-randomseed" +PACKAGECONFIG[resolved] = "--enable-resolved,--disable-resolved" PACKAGECONFIG[rfkill] = "--enable-rfkill,--disable-rfkill" -PACKAGECONFIG[hibernate] = "--enable-hibernate,--disable-hibernate" -PACKAGECONFIG[timedated] = "--enable-timedated,--disable-timedated" -PACKAGECONFIG[timesyncd] = "--enable-timesyncd,--disable-timesyncd" -PACKAGECONFIG[localed] = "--enable-localed,--disable-localed" -PACKAGECONFIG[efi] = "--enable-efi,--disable-efi" -PACKAGECONFIG[ima] = "--enable-ima,--disable-ima" -PACKAGECONFIG[smack] = "--enable-smack,--disable-smack" # libseccomp is found in meta-security PACKAGECONFIG[seccomp] = "--enable-seccomp,--disable-seccomp,libseccomp" -PACKAGECONFIG[logind] = "--enable-logind,--disable-logind" +PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,initscripts-sushell" +PACKAGECONFIG[smack] = "--enable-smack,--disable-smack" PACKAGECONFIG[sysusers] = "--enable-sysusers,--disable-sysusers" -PACKAGECONFIG[firstboot] = "--enable-firstboot,--disable-firstboot" -PACKAGECONFIG[randomseed] = "--enable-randomseed,--disable-randomseed" -PACKAGECONFIG[binfmt] = "--enable-binfmt,--disable-binfmt" +PACKAGECONFIG[timedated] = "--enable-timedated,--disable-timedated" +PACKAGECONFIG[timesyncd] = "--enable-timesyncd,--disable-timesyncd" +PACKAGECONFIG[usrmerge] = "--disable-split-usr,--enable-split-usr" PACKAGECONFIG[utmp] = "--enable-utmp,--disable-utmp" -PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit" -# importd requires curl/xz/zlib/bzip2/gcrypt -PACKAGECONFIG[importd] = "--enable-importd,--disable-importd" -PACKAGECONFIG[libidn] = "--enable-libidn,--disable-libidn,libidn" -PACKAGECONFIG[audit] = "--enable-audit,--disable-audit,audit" -PACKAGECONFIG[manpages] = "--enable-manpages,--disable-manpages,libxslt-native xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" -PACKAGECONFIG[pam] = "--enable-pam,--disable-pam,libpam,${PAM_PLUGINS}" +PACKAGECONFIG[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" +PACKAGECONFIG[vconsole] = "--enable-vconsole,--disable-vconsole,,${PN}-vconsole-setup" # Verify keymaps on locale change PACKAGECONFIG[xkbcommon] = "--enable-xkbcommon,--disable-xkbcommon,libxkbcommon" -# Update NAT firewall rules -PACKAGECONFIG[iptc] = "--enable-libiptc,--disable-libiptc,iptables" -PACKAGECONFIG[ldconfig] = "--enable-ldconfig,--disable-ldconfig,," -PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,initscripts-sushell" -PACKAGECONFIG[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" -PACKAGECONFIG[qrencode] = "--enable-qrencode,--disable-qrencode,qrencode" -PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" -PACKAGECONFIG[coredump] = "--enable-coredump,--disable-coredump" -PACKAGECONFIG[bzip2] = "--enable-bzip2,--disable-bzip2,bzip2" -PACKAGECONFIG[lz4] = "--enable-lz4,--disable-lz4,lz4" PACKAGECONFIG[xz] = "--enable-xz,--disable-xz,xz" PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib" -PACKAGECONFIG[usrmerge] = "--disable-split-usr, --enable-split-usr" CACHED_CONFIGUREVARS += "ac_cv_path_KILL=${base_bindir}/kill" CACHED_CONFIGUREVARS += "ac_cv_path_KMOD=${base_bindir}/kmod" -- 1.9.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 5/6] systemd: use consistent indenting and coding style in do_install() 2017-11-14 19:39 [PATCH 0/6] systemd: misc recipe cleanup Andre McCurdy ` (3 preceding siblings ...) 2017-11-14 19:39 ` [PATCH 4/6] systemd: sort " Andre McCurdy @ 2017-11-14 19:39 ` Andre McCurdy 2017-11-14 19:39 ` [PATCH 6/6] systemd: fix duplication of CACHED_CONFIGUREVARS Andre McCurdy 5 siblings, 0 replies; 7+ messages in thread From: Andre McCurdy @ 2017-11-14 19:39 UTC (permalink / raw) To: openembedded-core Make the polkit fixup etc at the end of do_install() more consistent with the rest of the function. Also indent do_install_ptest() with tabs instead of spaces to make do_install_ptest() consistent with do_install(). Signed-off-by: Andre McCurdy <armccurdy@gmail.com> --- meta/recipes-core/systemd/systemd_234.bb | 49 ++++++++++++++++---------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/meta/recipes-core/systemd/systemd_234.bb b/meta/recipes-core/systemd/systemd_234.bb index 1e2377a..d4e0b1f 100644 --- a/meta/recipes-core/systemd/systemd_234.bb +++ b/meta/recipes-core/systemd/systemd_234.bb @@ -219,7 +219,6 @@ do_install() { # 20:12 < mezcalero> koen: you have three options: a) run systemd-machine-id-setup at install time, b) have / read-only and an empty file there (for stateless) and c) boot with / writable touch ${D}${sysconfdir}/machine-id - install -d ${D}${sysconfdir}/udev/rules.d/ install -d ${D}${sysconfdir}/tmpfiles.d install -m 0644 ${WORKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/ @@ -275,39 +274,39 @@ do_install() { fi install -Dm 0755 ${S}/src/systemctl/systemd-sysv-install.SKELETON ${D}${systemd_unitdir}/systemd-sysv-install - # If polkit is setup fixup permissions and ownership - if [ "${@bb.utils.contains('PACKAGECONFIG', 'polkit', 'polkit', '', d)}" = "polkit" ] ; then - if [ -d ${D}${datadir}/polkit-1/rules.d ] ; then - chmod 700 ${D}${datadir}/polkit-1/rules.d - chown polkitd:root ${D}${datadir}/polkit-1/rules.d - fi - fi + # If polkit is setup fixup permissions and ownership + if ${@bb.utils.contains('PACKAGECONFIG', 'polkit', 'true', 'false', d)}; then + if [ -d ${D}${datadir}/polkit-1/rules.d ]; then + chmod 700 ${D}${datadir}/polkit-1/rules.d + chown polkitd:root ${D}${datadir}/polkit-1/rules.d + fi + fi } do_install_ptest () { - # install data files needed for tests - install -d ${D}${PTEST_PATH}/tests/test - cp -rfL ${S}/test/* ${D}${PTEST_PATH}/tests/test - # python is disabled for systemd, thus removing these python testing scripts - rm ${D}${PTEST_PATH}/tests/test/*.py - sed -i 's/"tree"/"ls"/' ${D}${PTEST_PATH}/tests/test/udev-test.pl + # install data files needed for tests + install -d ${D}${PTEST_PATH}/tests/test + cp -rfL ${S}/test/* ${D}${PTEST_PATH}/tests/test + # python is disabled for systemd, thus removing these python testing scripts + rm ${D}${PTEST_PATH}/tests/test/*.py + sed -i 's/"tree"/"ls"/' ${D}${PTEST_PATH}/tests/test/udev-test.pl - install -d ${D}${PTEST_PATH}/tests/catalog - install ${S}/catalog/* ${D}${PTEST_PATH}/tests/catalog/ + install -d ${D}${PTEST_PATH}/tests/catalog + install ${S}/catalog/* ${D}${PTEST_PATH}/tests/catalog/ - install -D ${S}/build-aux/test-driver ${D}${PTEST_PATH}/tests/build-aux/test-driver + install -D ${S}/build-aux/test-driver ${D}${PTEST_PATH}/tests/build-aux/test-driver - install -d ${D}${PTEST_PATH}/tests/rules - install ${B}/rules/* ${D}${PTEST_PATH}/tests/rules/ + install -d ${D}${PTEST_PATH}/tests/rules + install ${B}/rules/* ${D}${PTEST_PATH}/tests/rules/ - # This directory needs to be there for udev-test.pl to work. - install -d ${D}${libdir}/udev/rules.d + # This directory needs to be there for udev-test.pl to work. + install -d ${D}${libdir}/udev/rules.d - # install actual test binaries - install -m 0755 ${B}/test-* ${D}${PTEST_PATH}/tests/ - install -m 0755 ${B}/.libs/test-* ${D}${PTEST_PATH}/tests/ + # install actual test binaries + install -m 0755 ${B}/test-* ${D}${PTEST_PATH}/tests/ + install -m 0755 ${B}/.libs/test-* ${D}${PTEST_PATH}/tests/ - install ${B}/Makefile ${D}${PTEST_PATH}/tests/ + install ${B}/Makefile ${D}${PTEST_PATH}/tests/ } python populate_packages_prepend (){ -- 1.9.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 6/6] systemd: fix duplication of CACHED_CONFIGUREVARS 2017-11-14 19:39 [PATCH 0/6] systemd: misc recipe cleanup Andre McCurdy ` (4 preceding siblings ...) 2017-11-14 19:39 ` [PATCH 5/6] systemd: use consistent indenting and coding style in do_install() Andre McCurdy @ 2017-11-14 19:39 ` Andre McCurdy 5 siblings, 0 replies; 7+ messages in thread From: Andre McCurdy @ 2017-11-14 19:39 UTC (permalink / raw) To: openembedded-core Fix historical duplication that appears to have been caused by merging two independent fixes for the same issue: http://git.openembedded.org/openembedded-core/commit/?id=294adc0907a359d9c0ad260823188145aab294ad http://git.openembedded.org/openembedded-core/commit/?id=b30d7b1b97ffd1d44083d93ed0e572d80fcebc54 Also minor reformatting of EXTRA_OECONF values. Signed-off-by: Andre McCurdy <armccurdy@gmail.com> --- meta/recipes-core/systemd/systemd_234.bb | 44 +++++++++++++++----------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/meta/recipes-core/systemd/systemd_234.bb b/meta/recipes-core/systemd/systemd_234.bb index d4e0b1f..bfcecb3 100644 --- a/meta/recipes-core/systemd/systemd_234.bb +++ b/meta/recipes-core/systemd/systemd_234.bb @@ -149,11 +149,18 @@ PACKAGECONFIG[xkbcommon] = "--enable-xkbcommon,--disable-xkbcommon,libxkbcommon" PACKAGECONFIG[xz] = "--enable-xz,--disable-xz,xz" PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib" -CACHED_CONFIGUREVARS += "ac_cv_path_KILL=${base_bindir}/kill" -CACHED_CONFIGUREVARS += "ac_cv_path_KMOD=${base_bindir}/kmod" -CACHED_CONFIGUREVARS += "ac_cv_path_QUOTACHECK=${sbindir}/quotacheck" -CACHED_CONFIGUREVARS += "ac_cv_path_QUOTAON=${sbindir}/quotaon" -CACHED_CONFIGUREVARS += "ac_cv_path_SULOGIN=${base_sbindir}/sulogin" +# Hardcode target binary paths to avoid AC_PROG_PATH in the systemd +# configure script detecting and setting paths from sysroot or host. +CACHED_CONFIGUREVARS_class-target = " \ + ac_cv_path_KEXEC=${sbindir}/kexec \ + ac_cv_path_KILL=${base_bindir}/kill \ + ac_cv_path_KMOD=${base_bindir}/kmod \ + ac_cv_path_MOUNT_PATH=${base_bindir}/mount \ + ac_cv_path_QUOTACHECK=${sbindir}/quotacheck \ + ac_cv_path_QUOTAON=${sbindir}/quotaon \ + ac_cv_path_SULOGIN=${base_sbindir}/sulogin \ + ac_cv_path_UMOUNT_PATH=${base_bindir}/umount \ +" # Helper variables to clarify locations. This mirrors the logic in systemd's # build system. @@ -161,24 +168,15 @@ rootprefix ?= "${root_prefix}" rootlibdir ?= "${base_libdir}" rootlibexecdir = "${rootprefix}/lib" -CACHED_CONFIGUREVARS_class-target = "\ - ac_cv_path_MOUNT_PATH=${base_bindir}/mount \ - ac_cv_path_UMOUNT_PATH=${base_bindir}/umount \ - ac_cv_path_KMOD=${base_bindir}/kmod \ - ac_cv_path_KILL=${base_bindir}/kill \ - ac_cv_path_SULOGIN=${base_sbindir}/sulogin \ - ac_cv_path_KEXEC=${sbindir}/kexec \ - ac_cv_path_QUOTACHECK=${sbindir}/quotacheck \ - ac_cv_path_QUOTAON=${sbindir}/quotaon \ - " - -EXTRA_OECONF = " --with-rootprefix=${rootprefix} \ - --with-rootlibdir=${rootlibdir} \ - --with-roothomedir=${ROOT_HOME} \ - --without-python \ - --with-sysvrcnd-path=${sysconfdir} \ - --with-firmware-path=${nonarch_base_libdir}/firmware \ - " +EXTRA_OECONF = " \ + --without-python \ + --with-roothomedir=${ROOT_HOME} \ + --with-rootlibdir=${rootlibdir} \ + --with-rootprefix=${rootprefix} \ + --with-sysvrcnd-path=${sysconfdir} \ + --with-firmware-path=${nonarch_base_libdir}/firmware \ +" + # per the systemd README, define VALGRIND=1 to run under valgrind CFLAGS .= "${@bb.utils.contains('PACKAGECONFIG', 'valgrind', ' -DVALGRIND=1', '', d)}" -- 1.9.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-11-14 19:39 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-11-14 19:39 [PATCH 0/6] systemd: misc recipe cleanup Andre McCurdy 2017-11-14 19:39 ` [PATCH 1/6] tclibc-musl.inc: disable ldconfig distro feature Andre McCurdy 2017-11-14 19:39 ` [PATCH 2/6] systemd: remove musl specific control of ldconfig PACKAGECONFIG Andre McCurdy 2017-11-14 19:39 ` [PATCH 3/6] systemd: use consistent approach for musl PACKAGECONFIG options Andre McCurdy 2017-11-14 19:39 ` [PATCH 4/6] systemd: sort " Andre McCurdy 2017-11-14 19:39 ` [PATCH 5/6] systemd: use consistent indenting and coding style in do_install() Andre McCurdy 2017-11-14 19:39 ` [PATCH 6/6] systemd: fix duplication of CACHED_CONFIGUREVARS Andre McCurdy
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox