From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C5E3D1580FD for ; Sat, 28 Dec 2024 12:08:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DF94FE07B2; Sat, 28 Dec 2024 12:08:39 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B14D7E07A5 for ; Sat, 28 Dec 2024 12:08:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BF90D33BEE9 for ; Sat, 28 Dec 2024 12:08:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D29BC190F for ; Sat, 28 Dec 2024 12:08:35 +0000 (UTC) From: "Viorel Munteanu" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Viorel Munteanu" Message-ID: <1735387698.e5428bf94ffba72d5381a64ea5f984adf4af24d1.ceamac@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/busybox/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/busybox/busybox-1.36.1-r1.ebuild X-VCS-Directories: sys-apps/busybox/ X-VCS-Committer: ceamac X-VCS-Committer-Name: Viorel Munteanu X-VCS-Revision: e5428bf94ffba72d5381a64ea5f984adf4af24d1 X-VCS-Branch: master Date: Sat, 28 Dec 2024 12:08:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3d508f12-ee65-4b99-8358-2efbcddd727d X-Archives-Hash: 03fc2c909d99bd320ca10c8a961e943c commit: e5428bf94ffba72d5381a64ea5f984adf4af24d1 Author: Viorel Munteanu gentoo org> AuthorDate: Sat Dec 28 12:06:42 2024 +0000 Commit: Viorel Munteanu gentoo org> CommitDate: Sat Dec 28 12:08:18 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5428bf9 sys-apps/busybox: drop 1.36.1-r1 Signed-off-by: Viorel Munteanu gentoo.org> sys-apps/busybox/busybox-1.36.1-r1.ebuild | 387 ------------------------------ 1 file changed, 387 deletions(-) diff --git a/sys-apps/busybox/busybox-1.36.1-r1.ebuild b/sys-apps/busybox/busybox-1.36.1-r1.ebuild deleted file mode 100644 index 4ffa7b22781d..000000000000 --- a/sys-apps/busybox/busybox-1.36.1-r1.ebuild +++ /dev/null @@ -1,387 +0,0 @@ -# Copyright 1999-2024 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=8 - -inherit flag-o-matic readme.gentoo-r1 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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -fi -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" # GPL-2 only -SLOT="0" -IUSE="debug 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" - -DISABLE_AUTOFORMATTING=yes -DOC_CONTENTS=' -If you want a smaller executable, add `-Oz` to your busybox `CFLAGS`.' - -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}"/${PN}-1.36.0-fortify-source-3-fixdep.patch - - # "${FILESDIR}"/${P}-*.patch -) - -src_prepare() { - default - - cp "${FILESDIR}"/ginit.c init/ || die - - # flag cleanup - sed -i -r \ - -e 's:[[:space:]]?-(Werror|Os|Oz|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \ - Makefile.flags || die - sed -i \ - -e 's:-static-libgcc::' \ - Makefile.flags || die - - # Print all link lines too - sed -i -e 's:debug=false:debug=true:' scripts/trylink || die -} - -bbmake() { - local args=( - V=1 - CROSS_COMPILE="${CHOST}-" - AR="${AR}" - CC="${CC}" - HOSTCC="${BUILD_CC}" - HOSTCFLAGS="${BUILD_CFLAGS}" - PKG_CONFIG="${PKG_CONFIG}" - ) - emake "${args[@]}" "$@" -} - -src_configure() { - unset KBUILD_OUTPUT #88088 - export SKIP_STRIP=y - - tc-export AR CC BUILD_CC PKG_CONFIG - - tc-is-cross-compiler || BUILD_CFLAGS=${CFLAGS} - BUILD_CFLAGS+=" -D_FILE_OFFSET_BITS=64" #930513 - - append-flags -fno-strict-aliasing #310413 - use ppc64 && append-flags -mminimal-toc #130943 - - # 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 "" | bbmake -j1 oldconfig - 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 - bbmake -j1 allyesconfig SKIP_SELINUX=$(usex selinux n y) #620918 - # nommu forces a bunch of things off which we want on #387555 - busybox_config_option n NOMMU - sed -i '/^#/d' .config - yes "" | bbmake -j1 oldconfig SKIP_SELINUX=$(usex selinux n y) #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 - - 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