From d14501acaa1e3634cb0a6f6e356923391009eb46 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 1 Jun 2023 15:26:21 +0100 Subject: gentoo auto-resync : 01:06:2023 - 15:26:21 --- sys-apps/Manifest.gz | Bin 49504 -> 49511 bytes sys-apps/busybox/Manifest | 10 +- sys-apps/busybox/busybox-1.34.1-r1.ebuild | 363 ----------------------------- sys-apps/busybox/busybox-1.34.1-r2.ebuild | 4 +- sys-apps/busybox/busybox-1.35.0-r1.ebuild | 364 ------------------------------ sys-apps/busybox/busybox-1.35.0-r2.ebuild | 4 +- sys-apps/busybox/busybox-1.36.1.ebuild | 4 +- sys-apps/busybox/busybox-9999.ebuild | 4 +- 8 files changed, 16 insertions(+), 737 deletions(-) delete mode 100644 sys-apps/busybox/busybox-1.34.1-r1.ebuild delete mode 100644 sys-apps/busybox/busybox-1.35.0-r1.ebuild (limited to 'sys-apps') diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz index 52002ed2ae60..1fc3649d2521 100644 Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest index a8e6bed78083..905dba016b0e 100644 --- a/sys-apps/busybox/Manifest +++ b/sys-apps/busybox/Manifest @@ -21,10 +21,8 @@ AUX watchdog.initd 219 BLAKE2B 3726fec4551962d6e20859c52e18582fbf127e2fc2807379a DIST busybox-1.34.1.tar.bz2 2476932 BLAKE2B 1f45f58db26ae0bae2eb728db3a7d49680d611f489c4633d1fdf2827d3c33285721e232f722ac1f80f2ad7616352df9fd6b8880bcb5fa0dc6787b70c897dd033 SHA512 fb7e53a56c07b1098a12ee7232ad5401b147816648a0619b3b5358fdcf0915cfbb054500c0e0dd4acb3bc0a93a584b62bc5448e1f16b28004f58b39518a13b9d DIST busybox-1.35.0.tar.bz2 2480624 BLAKE2B c08656bc863cd3fa8f7269032e808a30832215c36414c12f8233ab00503636ed1979541b7df42df654f1dfdfdd46fc00c8fe790bf0bed629a915b4c806c643b9 SHA512 62b2e718b6669271380445ed6db249618d777a4e8d5e6d879fa39ffee43887b6a2e93ceef874c615c565ad492deb772b03a19b7475c403202741579fb151e16a DIST busybox-1.36.1.tar.bz2 2525473 BLAKE2B e515825cb3ab1c520e16b9c2512e9fc72947366a72a0466bff59b507fdffbc78fc9d16b44a26116175fc7a429d849ad944b1bc379d36c6d3a0eb20969997336e SHA512 8c0c754c9ae04b5e6b23596283a7d3a4ef96225fe179f92d6f6a99c69c0caa95b1aa56c267f52d7c807f6cc69e1f0b7dd29a8ac624098f601738f8c0c57980d4 -EBUILD busybox-1.34.1-r1.ebuild 10446 BLAKE2B dfb801339c953a69671c06bb51ad1b438ef79fe79a64584f379077a1a7c629e0a83672a68fc2a0166117aa886e30de56ac64ee5e467117d545e89e2332225d4f SHA512 8f4d2bb46c367957522ae1bef4f35b9cc08d6552e477baf49f5810010fd94e5e54640af2d17bc324c40c5d4a86a251ad44201f53283e0917a1bb4a4f5eef3ad1 -EBUILD busybox-1.34.1-r2.ebuild 10653 BLAKE2B ca87295f44a86accdc4a7660753839b200f8f818df59cddde9feee9a2bb2cf4bcf43299d515d775a6f72f86fb6b538382fb76ab9cc2793484d57ec970793cb3e SHA512 5446ca77d839590483b438964836d1b2b77162e0bb86b8cda68e67bcf77c297d1c5aad666d1b43d06114cec7764cfd340571c8ccf617abe4a0ee81f10ecb2c67 -EBUILD busybox-1.35.0-r1.ebuild 10490 BLAKE2B aac8738d166fc4b4abf59f2c56f7c42394240240e030a65bc8e3ac641e390ab1dad552d0074e1d258b60775e790e233fdda5b71a0b6a00d81d60de76a41665aa SHA512 7e29be4cb897304a2e22e43be1057bee381d45b29b3ca09021ae49a6ff606f7b074f62379e7da77ac8eb92f0cb6eb0bebd78b7b1dc307b863ae9459b57fb2f47 -EBUILD busybox-1.35.0-r2.ebuild 10697 BLAKE2B 4d064d275c0e2cd39b638d4e0f77ca789957b96c617b156c1d7001390f62391920eea186ab26ef4e50f087373780623a2c6ed406fb767e647228ca23b9e8fc0d SHA512 1efc5066073bf9265b80693edc6f4ebc181bb01e38ba03cf0ff762971670b79d402fa35066c56fd8721a453ed4037e1f95efcc7c33e950c51a81e50f4cea61bc -EBUILD busybox-1.36.1.ebuild 10396 BLAKE2B bb35f78c87fd5ba3fb3f0a456b1392d8e534ff828c9b2c1a26b2e3705e721eff9362b36e162c54084657f59d95955c745acc3aeaf821637f1b6a8b6684dc6981 SHA512 5f8a1c526ce915a289348689180c96eb9f6c931b5c3847c5ec1f0c8ff288462d19f1517a5b06f85f70d6ea8df9c27ee4f0fc545a7dcd86ffee0a81a7bd58909d -EBUILD busybox-9999.ebuild 10396 BLAKE2B bb35f78c87fd5ba3fb3f0a456b1392d8e534ff828c9b2c1a26b2e3705e721eff9362b36e162c54084657f59d95955c745acc3aeaf821637f1b6a8b6684dc6981 SHA512 5f8a1c526ce915a289348689180c96eb9f6c931b5c3847c5ec1f0c8ff288462d19f1517a5b06f85f70d6ea8df9c27ee4f0fc545a7dcd86ffee0a81a7bd58909d +EBUILD busybox-1.34.1-r2.ebuild 10753 BLAKE2B b9e7c9877750d30bdf0542687db3014ec7330083494af803d1ac3ec8fc30f803f6e45a932c26fc6d2397f1fa01af8a3c6f27bac32dd9e5229391319cd19f6e64 SHA512 634212464ef30bbb2993b7e7a9b0fd6aa229990955cac350aa06d0570dfded6b86c5e526eb1b2e1484a678694dda0fb7de60eb924643807a0df6dc76c9690485 +EBUILD busybox-1.35.0-r2.ebuild 10797 BLAKE2B cf86866d2e2e1d0e0c3b1aed5d79ddd6072be0974fc6bf66aa2b827f11fe8058b5ed4b1189fed988676cc8fa41d315a6865ce1e16a25fd81b7e7cecaaa2f498f SHA512 b97da2ba3efb0f19a9ba20529be108bf4147803b27423c62a11c9c7457df8751345ba7a2f99b263bdb5a3e90734597a4ba52ff63644420a5935b904514efa24a +EBUILD busybox-1.36.1.ebuild 10496 BLAKE2B d5e0d17f7bb3c3558295936b1b9cb12e12a7a9e8705373f995491199f0da75d86aa24daf16d9904950e4c111437442474d6395feef7a417492c477d385be2672 SHA512 ea6a4ecdcdacf1c106b5cdbf461b918dd9ce755005838eddb413403515b72ededdd30162d4a1f8884ece15717a124440a10c5665fb8236a74dfc4e36f7f3ef2e +EBUILD busybox-9999.ebuild 10496 BLAKE2B d5e0d17f7bb3c3558295936b1b9cb12e12a7a9e8705373f995491199f0da75d86aa24daf16d9904950e4c111437442474d6395feef7a417492c477d385be2672 SHA512 ea6a4ecdcdacf1c106b5cdbf461b918dd9ce755005838eddb413403515b72ededdd30162d4a1f8884ece15717a124440a10c5665fb8236a74dfc4e36f7f3ef2e MISC metadata.xml 873 BLAKE2B d9c3725e1c3587d497894761d9eda08b670522d5c1a5518ea879cb5c9f222519005d28a36d6dea0b34d4bf4a2352e54aa151177f98ac730ce5b83e87ae4d35a2 SHA512 4c74f718046b41fbcf0111c797d6cdfa1f647914bfa5ff9aaedd6844ba1367722f225ed8ac17717d7b44c5ddc3b450e130da46cc0f6e21501b66cfd267a8f9ad diff --git a/sys-apps/busybox/busybox-1.34.1-r1.ebuild b/sys-apps/busybox/busybox-1.34.1-r1.ebuild deleted file mode 100644 index 130d7bd7dce9..000000000000 --- a/sys-apps/busybox/busybox-1.34.1-r1.ebuild +++ /dev/null @@ -1,363 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# See `man savedconfig.eclass` for info on how to use USE=savedconfig. - -EAPI=7 - -inherit eapi8-dosym flag-o-matic savedconfig toolchain-funcs - -DESCRIPTION="Utilities for rescue and embedded systems" -HOMEPAGE="https://www.busybox.net/" -if [[ ${PV} == "9999" ]] ; then - MY_P="${P}" - EGIT_REPO_URI="https://git.busybox.net/busybox" - inherit git-r3 -else - MY_P="${PN}-${PV/_/-}" - SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -fi - -LICENSE="GPL-2" # GPL-2 only -SLOT="0" -IUSE="debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd" -REQUIRED_USE="pam? ( !static )" -RESTRICT="test" - -# TODO: Could make pkgconfig conditional on selinux? bug #782829 -RDEPEND=" - !static? ( - virtual/libc - virtual/libcrypt:= - selinux? ( sys-libs/libselinux ) - ) - pam? ( sys-libs/pam ) -" -DEPEND="${RDEPEND} - static? ( - virtual/libcrypt[static-libs] - selinux? ( sys-libs/libselinux[static-libs(+)] ) - ) - sys-kernel/linux-headers" -BDEPEND="virtual/pkgconfig" - -S="${WORKDIR}/${MY_P}" - -busybox_config_option() { - local flag=$1 ; shift - if [[ ${flag} != [yn] && ${flag} != \"* ]] ; then - busybox_config_option $(usex ${flag} y n) "$@" - return - fi - local expr - while [[ $# -gt 0 ]] ; do - case ${flag} in - y) expr="s:.*\.*set:CONFIG_$1=y:g" ;; - n) expr="s:CONFIG_$1=y:# CONFIG_$1 is not set:g" ;; - *) expr="s:.*\.*:CONFIG_$1=${flag}:g" ;; - esac - sed -i -e "${expr}" .config || die - einfo "$(grep "CONFIG_$1[= ]" .config || echo "Could not find CONFIG_$1 ...")" - shift - done -} - -busybox_config_enabled() { - local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config) - case ${val} in - "") return 1 ;; - y) return 0 ;; - *) echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;; - esac -} - -# patches go here! -PATCHES=( - "${FILESDIR}"/${PN}-1.26.2-bb.patch - "${FILESDIR}"/${PN}-1.34.1-skip-selinux-search.patch - # "${FILESDIR}"/${P}-*.patch -) - -src_prepare() { - default - unset KBUILD_OUTPUT #88088 - append-flags -fno-strict-aliasing #310413 - use ppc64 && append-flags -mminimal-toc #130943 - - cp "${FILESDIR}"/ginit.c init/ || die - - # flag cleanup - sed -i -r \ - -e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \ - Makefile.flags || die - #sed -i '/bbsh/s:^//::' include/applets.h - sed -i '/^#error Aborting compilation./d' applets/applets.c || die - use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile - sed -i \ - -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \ - -e "/^AR\>/s:=.*:= $(tc-getAR):" \ - -e "/^CC\>/s:=.*:= $(tc-getCC):" \ - -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ - -e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \ - Makefile || die - sed -i \ - -e 's:-static-libgcc::' \ - Makefile.flags || die -} - -src_configure() { - # check for a busybox config before making one of our own. - # if one exist lets return and use it. - - restore_config .config - if [ -f .config ]; then - yes "" | emake -j1 -s oldconfig >/dev/null - return 0 - else - ewarn "Could not locate user configfile, so we will save a default one" - fi - - # setting SKIP_SELINUX skips searching for selinux at this stage. We don't - # need to search now in case we end up not needing it after all. - # setup the config file - emake -j1 -s allyesconfig SKIP_SELINUX=$(usex selinux n y) >/dev/null #620918 - # nommu forces a bunch of things off which we want on #387555 - busybox_config_option n NOMMU - sed -i '/^#/d' .config - yes "" | emake -j1 -s oldconfig SKIP_SELINUX=$(usex selinux n y) >/dev/null #620918 - - # now turn off stuff we really don't want - busybox_config_option n DMALLOC - busybox_config_option n FEATURE_2_4_MODULES #607548 - busybox_config_option n FEATURE_SUID_CONFIG - busybox_config_option n BUILD_AT_ONCE - busybox_config_option n BUILD_LIBBUSYBOX - busybox_config_option n FEATURE_CLEAN_UP - busybox_config_option n MONOTONIC_SYSCALL - busybox_config_option n USE_PORTABLE_CODE - busybox_config_option n WERROR - # CONFIG_MODPROBE_SMALL=y disables depmod.c and uses a smaller one that - # does not support -b. Setting this to no creates slightly larger and - # slightly more useful modutils - busybox_config_option n MODPROBE_SMALL #472464 - # triming the BSS size may be dangerous - busybox_config_option n FEATURE_USE_BSS_TAIL - - # These cause trouble with musl. - if use elibc_musl; then - busybox_config_option n FEATURE_UTMP - busybox_config_option n EXTRA_COMPAT - busybox_config_option n FEATURE_VI_REGEX_SEARCH - fi - - # Disable standalone shell mode when using make-symlinks, else Busybox calls its - # applets by default without looking up in PATH. - # This also enables users to disable a builtin by deleting the corresponding symlink. - if use make-symlinks; then - busybox_config_option n FEATURE_PREFER_APPLETS - busybox_config_option n FEATURE_SH_STANDALONE - fi - - # If these are not set and we are using a busybox setup - # all calls to system() will fail. - busybox_config_option y ASH - busybox_config_option y SH_IS_ASH - busybox_config_option n HUSH - busybox_config_option n SH_IS_HUSH - - busybox_config_option '"/run"' PID_FILE_PATH - busybox_config_option '"/run/ifstate"' IFUPDOWN_IFSTATE_PATH - - # disable ipv6 applets - if ! use ipv6; then - busybox_config_option n FEATURE_IPV6 - busybox_config_option n TRACEROUTE6 - busybox_config_option n PING6 - busybox_config_option n UDHCPC6 - fi - - busybox_config_option pam PAM - busybox_config_option static STATIC - busybox_config_option syslog {K,SYS}LOGD LOGGER - busybox_config_option systemd FEATURE_SYSTEMD - busybox_config_option math FEATURE_AWK_LIBM - - # all the debug options are compiler related, so punt them - busybox_config_option n DEBUG_SANITIZE - busybox_config_option n DEBUG - busybox_config_option y NO_DEBUG_LIB - busybox_config_option n DMALLOC - busybox_config_option n EFENCE - busybox_config_option $(usex debug y n) TFTP_DEBUG - - busybox_config_option selinux SELINUX - - # this opt only controls mounting with /dev/null -} - -src_compile() { - unset KBUILD_OUTPUT #88088 - export SKIP_STRIP=y - - emake V=1 busybox - - # bug #701512 - emake V=1 doc -} - -src_install() { - unset KBUILD_OUTPUT #88088 - save_config .config - - into / - dodir /bin - if use sep-usr ; then - # install /ginit to take care of mounting stuff - exeinto / - newexe busybox_unstripped ginit - dosym /ginit /bin/bb - dosym bb /bin/busybox - else - newbin busybox_unstripped busybox - dosym busybox /bin/bb - fi - if use mdev ; then - dodir /$(get_libdir)/mdev/ - use make-symlinks || dosym /bin/bb /sbin/mdev - cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf || die - if [[ ! "$(get_libdir)" == "lib" ]]; then - sed -i -e "s:/lib/:/$(get_libdir)/:g" "${ED}"/etc/mdev.conf || die #831251 - replace lib with lib64 where appropriate - fi - - exeinto /$(get_libdir)/mdev/ - doexe "${FILESDIR}"/mdev/* - - newinitd "${FILESDIR}"/mdev.initd mdev - fi - if use livecd ; then - dosym busybox /bin/vi - fi - - # add busybox daemon's, bug #444718 - if busybox_config_enabled FEATURE_NTPD_SERVER; then - newconfd "${FILESDIR}"/ntpd.confd busybox-ntpd - newinitd "${FILESDIR}"/ntpd.initd busybox-ntpd - fi - if busybox_config_enabled SYSLOGD; then - newconfd "${FILESDIR}"/syslogd.confd busybox-syslogd - newinitd "${FILESDIR}"/syslogd.initd busybox-syslogd - fi - if busybox_config_enabled KLOGD; then - newconfd "${FILESDIR}"/klogd.confd busybox-klogd - newinitd "${FILESDIR}"/klogd.initd busybox-klogd - fi - if busybox_config_enabled WATCHDOG; then - newconfd "${FILESDIR}"/watchdog.confd busybox-watchdog - newinitd "${FILESDIR}"/watchdog.initd busybox-watchdog - fi - if busybox_config_enabled UDHCPC; then - sed -i 's:$((metric++)):$metric; metric=$((metric + 1)):' examples/udhcp/simple.script || die #801535 - local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT) - exeinto "${path%/*}" - newexe examples/udhcp/simple.script "${path##*/}" - fi - if busybox_config_enabled UDHCPD; then - insinto /etc - doins examples/udhcp/udhcpd.conf - fi - if busybox_config_enabled ASH && ! use make-symlinks; then - dosym8 -r /bin/busybox /bin/ash - fi - if busybox_config_enabled CROND; then - newconfd "${FILESDIR}"/crond.confd busybox-crond - newinitd "${FILESDIR}"/crond.initd busybox-crond - fi - - # bundle up the symlink files for use later - emake DESTDIR="${ED}" install - rm _install/bin/busybox || die - # for compatibility, provide /usr/bin/env - mkdir -p _install/usr/bin || die - if [[ ! -e _install/usr/bin/env ]]; then - ln -s /bin/env _install/usr/bin/env || die - fi - tar cf busybox-links.tar -C _install . || : #;die - insinto /usr/share/${PN} - use make-symlinks && doins busybox-links.tar - - dodoc AUTHORS README TODO - - cd docs || die - doman busybox.1 - docinto txt - dodoc *.txt - docinto pod - dodoc *.pod - docinto html - dodoc *.html - - cd ../examples || die - docinto examples - dodoc inittab depmod.pl *.conf *.script undeb unrpm - - cd ../networking || die - dodoc httpd_indexcgi.c httpd_post_upload.cgi -} - -pkg_preinst() { - if use make-symlinks ; then - mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die - fi -} - -pkg_postinst() { - savedconfig_pkg_postinst - - if use make-symlinks ; then - cd "${T}" || die - mkdir _install - tar xf busybox-links.tar -C _install || die - echo n | cp -ivpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed" - fi - - if use sep-usr ; then - elog "In order to use the sep-usr support, you have to update your" - elog "kernel command line. Add the option:" - elog " init=/ginit" - elog "To launch a different init than /sbin/init, use:" - elog " init=/ginit /sbin/yourinit" - elog "To get a rescue shell, you may boot with:" - elog " init=/ginit bb" - fi -} diff --git a/sys-apps/busybox/busybox-1.34.1-r2.ebuild b/sys-apps/busybox/busybox-1.34.1-r2.ebuild index cf4da6210564..e316fec96042 100644 --- a/sys-apps/busybox/busybox-1.34.1-r2.ebuild +++ b/sys-apps/busybox/busybox-1.34.1-r2.ebuild @@ -355,7 +355,9 @@ pkg_postinst() { cd "${T}" || die mkdir _install tar xf busybox-links.tar -C _install || die - echo n | cp -ivpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed" + # 907432: cp -n returns error if it skips any file, but that is expected here + # TODO: check if a new coreutils release has a replacement option + cp -nvpPR _install/* "${ROOT}"/ fi if use sep-usr ; then diff --git a/sys-apps/busybox/busybox-1.35.0-r1.ebuild b/sys-apps/busybox/busybox-1.35.0-r1.ebuild deleted file mode 100644 index d08c6a826b69..000000000000 --- a/sys-apps/busybox/busybox-1.35.0-r1.ebuild +++ /dev/null @@ -1,364 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# See `man savedconfig.eclass` for info on how to use USE=savedconfig. - -EAPI=7 - -inherit eapi8-dosym flag-o-matic savedconfig toolchain-funcs - -DESCRIPTION="Utilities for rescue and embedded systems" -HOMEPAGE="https://www.busybox.net/" -if [[ ${PV} == "9999" ]] ; then - MY_P="${P}" - EGIT_REPO_URI="https://git.busybox.net/busybox" - inherit git-r3 -else - MY_P="${PN}-${PV/_/-}" - SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2" - # unstable release - no keywords - # KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -fi - -LICENSE="GPL-2" # GPL-2 only -SLOT="0" -IUSE="debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd" -REQUIRED_USE="pam? ( !static )" -RESTRICT="test" - -# TODO: Could make pkgconfig conditional on selinux? bug #782829 -RDEPEND=" - !static? ( - virtual/libc - virtual/libcrypt:= - selinux? ( sys-libs/libselinux ) - ) - pam? ( sys-libs/pam ) -" -DEPEND="${RDEPEND} - static? ( - virtual/libcrypt[static-libs] - selinux? ( sys-libs/libselinux[static-libs(+)] ) - ) - sys-kernel/linux-headers" -BDEPEND="virtual/pkgconfig" - -S="${WORKDIR}/${MY_P}" - -busybox_config_option() { - local flag=$1 ; shift - if [[ ${flag} != [yn] && ${flag} != \"* ]] ; then - busybox_config_option $(usex ${flag} y n) "$@" - return - fi - local expr - while [[ $# -gt 0 ]] ; do - case ${flag} in - y) expr="s:.*\.*set:CONFIG_$1=y:g" ;; - n) expr="s:CONFIG_$1=y:# CONFIG_$1 is not set:g" ;; - *) expr="s:.*\.*:CONFIG_$1=${flag}:g" ;; - esac - sed -i -e "${expr}" .config || die - einfo "$(grep "CONFIG_$1[= ]" .config || echo "Could not find CONFIG_$1 ...")" - shift - done -} - -busybox_config_enabled() { - local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config) - case ${val} in - "") return 1 ;; - y) return 0 ;; - *) echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;; - esac -} - -# patches go here! -PATCHES=( - "${FILESDIR}"/${PN}-1.26.2-bb.patch - "${FILESDIR}"/${PN}-1.34.1-skip-selinux-search.patch - # "${FILESDIR}"/${P}-*.patch -) - -src_prepare() { - default - unset KBUILD_OUTPUT #88088 - append-flags -fno-strict-aliasing #310413 - use ppc64 && append-flags -mminimal-toc #130943 - - cp "${FILESDIR}"/ginit.c init/ || die - - # flag cleanup - sed -i -r \ - -e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \ - Makefile.flags || die - #sed -i '/bbsh/s:^//::' include/applets.h - sed -i '/^#error Aborting compilation./d' applets/applets.c || die - use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile - sed -i \ - -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \ - -e "/^AR\>/s:=.*:= $(tc-getAR):" \ - -e "/^CC\>/s:=.*:= $(tc-getCC):" \ - -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ - -e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \ - Makefile || die - sed -i \ - -e 's:-static-libgcc::' \ - Makefile.flags || die -} - -src_configure() { - # check for a busybox config before making one of our own. - # if one exist lets return and use it. - - restore_config .config - if [ -f .config ]; then - yes "" | emake -j1 -s oldconfig >/dev/null - return 0 - else - ewarn "Could not locate user configfile, so we will save a default one" - fi - - # setting SKIP_SELINUX skips searching for selinux at this stage. We don't - # need to search now in case we end up not needing it after all. - # setup the config file - emake -j1 -s allyesconfig SKIP_SELINUX=$(usex selinux n y) >/dev/null #620918 - # nommu forces a bunch of things off which we want on #387555 - busybox_config_option n NOMMU - sed -i '/^#/d' .config - yes "" | emake -j1 -s oldconfig SKIP_SELINUX=$(usex selinux n y) >/dev/null #620918 - - # now turn off stuff we really don't want - busybox_config_option n DMALLOC - busybox_config_option n FEATURE_2_4_MODULES #607548 - busybox_config_option n FEATURE_SUID_CONFIG - busybox_config_option n BUILD_AT_ONCE - busybox_config_option n BUILD_LIBBUSYBOX - busybox_config_option n FEATURE_CLEAN_UP - busybox_config_option n MONOTONIC_SYSCALL - busybox_config_option n USE_PORTABLE_CODE - busybox_config_option n WERROR - # CONFIG_MODPROBE_SMALL=y disables depmod.c and uses a smaller one that - # does not support -b. Setting this to no creates slightly larger and - # slightly more useful modutils - busybox_config_option n MODPROBE_SMALL #472464 - # triming the BSS size may be dangerous - busybox_config_option n FEATURE_USE_BSS_TAIL - - # These cause trouble with musl. - if use elibc_musl; then - busybox_config_option n FEATURE_UTMP - busybox_config_option n EXTRA_COMPAT - busybox_config_option n FEATURE_VI_REGEX_SEARCH - fi - - # Disable standalone shell mode when using make-symlinks, else Busybox calls its - # applets by default without looking up in PATH. - # This also enables users to disable a builtin by deleting the corresponding symlink. - if use make-symlinks; then - busybox_config_option n FEATURE_PREFER_APPLETS - busybox_config_option n FEATURE_SH_STANDALONE - fi - - # If these are not set and we are using a busybox setup - # all calls to system() will fail. - busybox_config_option y ASH - busybox_config_option y SH_IS_ASH - busybox_config_option n HUSH - busybox_config_option n SH_IS_HUSH - - busybox_config_option '"/run"' PID_FILE_PATH - busybox_config_option '"/run/ifstate"' IFUPDOWN_IFSTATE_PATH - - # disable ipv6 applets - if ! use ipv6; then - busybox_config_option n FEATURE_IPV6 - busybox_config_option n TRACEROUTE6 - busybox_config_option n PING6 - busybox_config_option n UDHCPC6 - fi - - busybox_config_option pam PAM - busybox_config_option static STATIC - busybox_config_option syslog {K,SYS}LOGD LOGGER - busybox_config_option systemd FEATURE_SYSTEMD - busybox_config_option math FEATURE_AWK_LIBM - - # all the debug options are compiler related, so punt them - busybox_config_option n DEBUG_SANITIZE - busybox_config_option n DEBUG - busybox_config_option y NO_DEBUG_LIB - busybox_config_option n DMALLOC - busybox_config_option n EFENCE - busybox_config_option $(usex debug y n) TFTP_DEBUG - - busybox_config_option selinux SELINUX - - # this opt only controls mounting with /dev/null -} - -src_compile() { - unset KBUILD_OUTPUT #88088 - export SKIP_STRIP=y - - emake V=1 busybox - - # bug #701512 - emake V=1 doc -} - -src_install() { - unset KBUILD_OUTPUT #88088 - save_config .config - - into / - dodir /bin - if use sep-usr ; then - # install /ginit to take care of mounting stuff - exeinto / - newexe busybox_unstripped ginit - dosym /ginit /bin/bb - dosym bb /bin/busybox - else - newbin busybox_unstripped busybox - dosym busybox /bin/bb - fi - if use mdev ; then - dodir /$(get_libdir)/mdev/ - use make-symlinks || dosym /bin/bb /sbin/mdev - cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf || die - if [[ ! "$(get_libdir)" == "lib" ]]; then - sed -i -e "s:/lib/:/$(get_libdir)/:g" "${ED}"/etc/mdev.conf || die #831251 - replace lib with lib64 where appropriate - fi - - exeinto /$(get_libdir)/mdev/ - doexe "${FILESDIR}"/mdev/* - - newinitd "${FILESDIR}"/mdev.initd mdev - fi - if use livecd ; then - dosym busybox /bin/vi - fi - - # add busybox daemon's, bug #444718 - if busybox_config_enabled FEATURE_NTPD_SERVER; then - newconfd "${FILESDIR}"/ntpd.confd busybox-ntpd - newinitd "${FILESDIR}"/ntpd.initd busybox-ntpd - fi - if busybox_config_enabled SYSLOGD; then - newconfd "${FILESDIR}"/syslogd.confd busybox-syslogd - newinitd "${FILESDIR}"/syslogd.initd busybox-syslogd - fi - if busybox_config_enabled KLOGD; then - newconfd "${FILESDIR}"/klogd.confd busybox-klogd - newinitd "${FILESDIR}"/klogd.initd busybox-klogd - fi - if busybox_config_enabled WATCHDOG; then - newconfd "${FILESDIR}"/watchdog.confd busybox-watchdog - newinitd "${FILESDIR}"/watchdog.initd busybox-watchdog - fi - if busybox_config_enabled UDHCPC; then - sed -i 's:$((metric++)):$metric; metric=$((metric + 1)):' examples/udhcp/simple.script || die #801535 - local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT) - exeinto "${path%/*}" - newexe examples/udhcp/simple.script "${path##*/}" - fi - if busybox_config_enabled UDHCPD; then - insinto /etc - doins examples/udhcp/udhcpd.conf - fi - if busybox_config_enabled ASH && ! use make-symlinks; then - dosym8 -r /bin/busybox /bin/ash - fi - if busybox_config_enabled CROND; then - newconfd "${FILESDIR}"/crond.confd busybox-crond - newinitd "${FILESDIR}"/crond.initd busybox-crond - fi - - # bundle up the symlink files for use later - emake DESTDIR="${ED}" install - rm _install/bin/busybox || die - # for compatibility, provide /usr/bin/env - mkdir -p _install/usr/bin || die - if [[ ! -e _install/usr/bin/env ]]; then - ln -s /bin/env _install/usr/bin/env || die - fi - tar cf busybox-links.tar -C _install . || : #;die - insinto /usr/share/${PN} - use make-symlinks && doins busybox-links.tar - - dodoc AUTHORS README TODO - - cd docs || die - doman busybox.1 - docinto txt - dodoc *.txt - docinto pod - dodoc *.pod - docinto html - dodoc *.html - - cd ../examples || die - docinto examples - dodoc inittab depmod.pl *.conf *.script undeb unrpm - - cd ../networking || die - dodoc httpd_indexcgi.c httpd_post_upload.cgi -} - -pkg_preinst() { - if use make-symlinks ; then - mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die - fi -} - -pkg_postinst() { - savedconfig_pkg_postinst - - if use make-symlinks ; then - cd "${T}" || die - mkdir _install - tar xf busybox-links.tar -C _install || die - echo n | cp -ivpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed" - fi - - if use sep-usr ; then - elog "In order to use the sep-usr support, you have to update your" - elog "kernel command line. Add the option:" - elog " init=/ginit" - elog "To launch a different init than /sbin/init, use:" - elog " init=/ginit /sbin/yourinit" - elog "To get a rescue shell, you may boot with:" - elog " init=/ginit bb" - fi -} diff --git a/sys-apps/busybox/busybox-1.35.0-r2.ebuild b/sys-apps/busybox/busybox-1.35.0-r2.ebuild index 711785eae12b..b120932ad31f 100644 --- a/sys-apps/busybox/busybox-1.35.0-r2.ebuild +++ b/sys-apps/busybox/busybox-1.35.0-r2.ebuild @@ -356,7 +356,9 @@ pkg_postinst() { cd "${T}" || die mkdir _install tar xf busybox-links.tar -C _install || die - echo n | cp -ivpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed" + # 907432: cp -n returns error if it skips any file, but that is expected here + # TODO: check if a new coreutils release has a replacement option + cp -nvpPR _install/* "${ROOT}"/ fi if use sep-usr ; then diff --git a/sys-apps/busybox/busybox-1.36.1.ebuild b/sys-apps/busybox/busybox-1.36.1.ebuild index a9f3d85703c7..8a030a712279 100644 --- a/sys-apps/busybox/busybox-1.36.1.ebuild +++ b/sys-apps/busybox/busybox-1.36.1.ebuild @@ -346,7 +346,9 @@ pkg_postinst() { cd "${T}" || die mkdir _install tar xf busybox-links.tar -C _install || die - echo n | cp -ivpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed" + # 907432: cp -n returns error if it skips any file, but that is expected here + # TODO: check if a new coreutils release has a replacement option + cp -nvpPR _install/* "${ROOT}"/ fi if use sep-usr ; then diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild index a9f3d85703c7..8a030a712279 100644 --- a/sys-apps/busybox/busybox-9999.ebuild +++ b/sys-apps/busybox/busybox-9999.ebuild @@ -346,7 +346,9 @@ pkg_postinst() { cd "${T}" || die mkdir _install tar xf busybox-links.tar -C _install || die - echo n | cp -ivpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed" + # 907432: cp -n returns error if it skips any file, but that is expected here + # TODO: check if a new coreutils release has a replacement option + cp -nvpPR _install/* "${ROOT}"/ fi if use sep-usr ; then -- cgit v1.2.3