From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.77) (envelope-from ) id 1SmzMn-0004A9-46 for garchives@archives.gentoo.org; Fri, 06 Jul 2012 03:38:01 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9E528E0777; Fri, 6 Jul 2012 03:37:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 58329E0777 for ; Fri, 6 Jul 2012 03:37:47 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5BC071B401A for ; Fri, 6 Jul 2012 03:37:46 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 559) id 1217F2004B; Fri, 6 Jul 2012 03:37:45 +0000 (UTC) From: "Mike Frysinger (vapier)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, vapier@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/busybox: busybox-1.20.2.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: busybox-1.20.2.ebuild ChangeLog X-VCS-Directories: sys-apps/busybox X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger Content-Type: text/plain; charset=utf8 Message-Id: <20120706033745.1217F2004B@flycatcher.gentoo.org> Date: Fri, 6 Jul 2012 03:37:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 3b8d56fe-7e04-44a1-be37-54aaed2df424 X-Archives-Hash: ca8acb63d07530ebc56036952570624f vapier 12/07/06 03:37:45 Modified: ChangeLog Added: busybox-1.20.2.ebuild Log: Version bump and fix for building with glibc-2.16 #424954 by Stevan Baj= i=C4=87. =20 (Portage version: 2.2.0_alpha115/cvs/Linux x86_64) Revision Changes Path 1.318 sys-apps/busybox/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/C= hangeLog?rev=3D1.318&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/C= hangeLog?rev=3D1.318&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/C= hangeLog?r1=3D1.317&r2=3D1.318 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v retrieving revision 1.317 retrieving revision 1.318 diff -u -r1.317 -r1.318 --- ChangeLog 20 Jun 2012 20:12:17 -0000 1.317 +++ ChangeLog 6 Jul 2012 03:37:44 -0000 1.318 @@ -1,6 +1,12 @@ # ChangeLog for sys-apps/busybox # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.317 20= 12/06/20 20:12:17 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.318 20= 12/07/06 03:37:44 vapier Exp $ + +*busybox-1.20.2 (06 Jul 2012) + + 06 Jul 2012; Mike Frysinger +busybox-1.20.2.ebuild= , + +files/busybox-1.20.2-glibc-sys-resource.patch: + Version bump and fix for building with glibc-2.16 #424954 by Stevan Ba= ji=C4=87. =20 20 Jun 2012; Markus Meier busybox-1.20.1.ebuild: arm stable, bug #419689 1.1 sys-apps/busybox/busybox-1.20.2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/b= usybox-1.20.2.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/b= usybox-1.20.2.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: busybox-1.20.2.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.20.2.ebuild= ,v 1.1 2012/07/06 03:37:44 vapier Exp $ EAPI=3D"4" inherit eutils flag-o-matic savedconfig toolchain-funcs multilib #########################################################################= ####### # BUSYBOX ALTERNATE CONFIG MINI-HOWTO # # Busybox can be modified in many different ways. Here's a few ways to do= it: # # (1) Emerge busybox with FEATURES=3Dkeepwork so the work directory won't # get erased afterwards. Add a definition like ROOT=3D/my/root/path t= o the # start of the line if you're installing to somewhere else than the r= oot # directory. This command will save the default configuration to # ${PORTAGE_CONFIGROOT} (or ${ROOT} if ${PORTAGE_CONFIGROOT} is not # defined), and it will tell you that it has done this. Note the loca= tion # where the config file was saved. # # FEATURES=3Dkeepwork USE=3Dsavedconfig emerge busybox # # (2) Go to the work directory and change the configuration of busybox us= ing its # menuconfig feature. # # cd /var/tmp/portage/busybox*/work/busybox-* # make menuconfig # # (3) Save your configuration to the default location and copy it to the # one of the locations listed in /usr/portage/eclass/savedconfig.ecla= ss # # (4) Emerge busybox with USE=3Dsavedconfig to use the configuration file= you # just generated. # #########################################################################= ####### # # (1) Alternatively skip the above steps and simply emerge busybox withou= t # USE=3Dsavedconfig. # # (2) Edit the file it saves by hand. ${ROOT}"/etc/portage/savedconfig/${= CATEGORY}/${PF} # # (3) Remerge busybox as using USE=3Dsavedconfig. # #########################################################################= ####### DESCRIPTION=3D"Utilities for rescue and embedded systems" HOMEPAGE=3D"http://www.busybox.net/" if [[ ${PV} =3D=3D "9999" ]] ; then MY_P=3D${PN} EGIT_REPO_URI=3D"git://busybox.net/busybox.git" inherit git-2 else MY_P=3D${PN}-${PV/_/-} SRC_URI=3D"http://www.busybox.net/downloads/${MY_P}.tar.bz2" KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390= ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" fi LICENSE=3D"GPL-2" SLOT=3D"0" IUSE=3D"ipv6 livecd make-symlinks math mdev -pam selinux sep-usr static" RESTRICT=3D"test" RDEPEND=3D"selinux? ( sys-libs/libselinux ) pam? ( sys-libs/pam )" DEPEND=3D"${RDEPEND} >=3Dsys-kernel/linux-headers-2.6.39" S=3D${WORKDIR}/${MY_P} busybox_config_option() { case $1 in y) sed -i -e "s:.*\.*set:CONFIG_$2=3Dy:g" .config;; n) sed -i -e "s:CONFIG_$2=3Dy:# CONFIG_$2 is not set:g" .config;; *) use $1 \ && busybox_config_option y $2 \ || busybox_config_option n $2 return 0 ;; esac einfo $(grep "CONFIG_$2[=3D ]" .config || echo Could not find CONFIG_$2 = ...) } src_prepare() { unset KBUILD_OUTPUT #88088 append-flags -fno-strict-aliasing #310413 use ppc64 && append-flags -mminimal-toc #130943 # patches go here! epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch epatch "${FILESDIR}"/${P}-*.patch cp "${FILESDIR}"/ginit.c init/ || die # flag cleanup sed -i -r \ -e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=3D1= |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:=3D.*:=3D ${CHOST}-:" \ -e "/^AR\>/s:=3D.*:=3D $(tc-getAR):" \ -e "/^CC\>/s:=3D.*:=3D $(tc-getCC):" \ -e "/^HOSTCC/s:=3D.*:=3D $(tc-getBUILD_CC):" \ 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 oldconfig > /dev/null return 0 else ewarn "Could not locate user configfile, so we will save a default one" fi # setup the config file emake -j1 allyesconfig > /dev/null # nommu forces a bunch of things off which we want on #387555 busybox_config_option n NOMMU sed -i '/^#/d' .config yes "" | emake -j1 oldconfig >/dev/null # now turn off stuff we really don't want busybox_config_option n DMALLOC busybox_config_option n FEATURE_SUID_CONFIG busybox_config_option n BUILD_AT_ONCE busybox_config_option n BUILD_LIBBUSYBOX busybox_config_option n MONOTONIC_SYSCALL busybox_config_option n WERROR # If these are not set and we are using a uclibc/busybox setup # all calls to system() will fail. busybox_config_option y ASH busybox_config_option n HUSH # disable ipv6 applets if ! use ipv6; then busybox_config_option n FEATURE_IPV6 busybox_config_option n TRACEROUTE6 busybox_config_option n PING6 fi if use static && use pam ; then ewarn "You cannot have USE=3D'static pam'. Assuming static is more imp= ortant." fi use static \ && busybox_config_option n PAM \ || busybox_config_option pam PAM busybox_config_option static STATIC busybox_config_option math FEATURE_AWK_LIBM # all the debug options are compiler related, so punt them 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 selinux SELINUX # this opt only controls mounting with /dev/null } src_compile() { unset KBUILD_OUTPUT #88088 export SKIP_STRIP=3Dy emake V=3D1 busybox if ! use static ; then cp .config{,.bak} mv busybox_unstripped{,.bak} use pam && busybox_config_option n PAM emake CONFIG_STATIC=3Dy busybox mv busybox_unstripped bb mv busybox_unstripped{.bak,} mv .config{.bak,} else # keeps src_install simpler ln busybox_unstripped bb fi } 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 bb ginit dosym /ginit /bin/bb if use static ; then dosym bb /bin/busybox else newbin busybox_unstripped busybox fi else newbin busybox_unstripped busybox if use static ; then dosym busybox /bin/bb else dobin bb fi 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 exeinto /$(get_libdir)/mdev/ doexe "${FILESDIR}"/mdev/* newinitd "${FILESDIR}"/mdev.rc.1 mdev fi if use livecd ; then dosym busybox /bin/vi fi # bundle up the symlink files for use later emake DESTDIR=3D"${ED}" install rm _install/bin/busybox 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 docinto txt dodoc *.txt docinto pod dodoc *.pod dohtml *.html cd ../examples docinto examples dodoc inittab depmod.pl *.conf *.script undeb unrpm } pkg_preinst() { if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} =3D=3D "yes" ]] = && [[ ${ROOT} =3D=3D "/" ]] ; then ewarn "setting USE=3Dmake-symlinks and emerging to / is very dangerous.= " ewarn "it WILL overwrite lots of system programs like: ls bash awk grep= (bug 60805 for full list)." ewarn "If you are creating a binary only and not merging this is probab= ly ok." ewarn "set env VERY_BRAVE_OR_VERY_DUMB=3Dyes if this is really what you= want." die "silly options will destroy your system" fi 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 cp -vpPR _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=3D/ginit" elog "To launch a different init than /sbin/init, use:" elog " init=3D/ginit /sbin/yourinit" elog "To get a rescue shell, you may boot with:" elog " init=3D/ginit bb" fi }