* [gentoo-commits] gentoo-x86 commit in sys-apps/busybox: busybox-1.17.1-r1.ebuild ChangeLog
@ 2010-11-16 12:14 Mike Frysinger (vapier)
0 siblings, 0 replies; 3+ messages in thread
From: Mike Frysinger (vapier) @ 2010-11-16 12:14 UTC (permalink / raw
To: gentoo-commits
vapier 10/11/16 12:14:41
Modified: busybox-1.17.1-r1.ebuild ChangeLog
Log:
Disable USE=pam when building the static rescue shell #345665 by Paweł Hajdan jr.
(Portage version: 2.2.0_alpha4/cvs/Linux x86_64)
Revision Changes Path
1.3 sys-apps/busybox/busybox-1.17.1-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/busybox-1.17.1-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/busybox-1.17.1-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/busybox-1.17.1-r1.ebuild?r1=1.2&r2=1.3
Index: busybox-1.17.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.17.1-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- busybox-1.17.1-r1.ebuild 28 Sep 2010 16:53:47 -0000 1.2
+++ busybox-1.17.1-r1.ebuild 16 Nov 2010 12:14:41 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.17.1-r1.ebuild,v 1.2 2010/09/28 16:53:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.17.1-r1.ebuild,v 1.3 2010/11/16 12:14:41 vapier Exp $
EAPI=2
inherit eutils flag-o-matic savedconfig toolchain-funcs
@@ -177,11 +177,14 @@
export SKIP_STRIP=y
emake busybox || die "build failed"
- if ! use static && ! use pam ; then
+ if ! use static ; then
+ cp .config{,.bak}
mv busybox_unstripped{,.bak}
+ use pam && busybox_config_option n PAM
emake CONFIG_STATIC=y busybox || die "static build failed"
mv busybox_unstripped bb
mv busybox_unstripped{.bak,}
+ mv .config{.bak,}
fi
}
1.257 sys-apps/busybox/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/ChangeLog?rev=1.257&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/ChangeLog?rev=1.257&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/ChangeLog?r1=1.256&r2=1.257
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -r1.256 -r1.257
--- ChangeLog 28 Sep 2010 16:53:47 -0000 1.256
+++ ChangeLog 16 Nov 2010 12:14:41 -0000 1.257
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/busybox
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.256 2010/09/28 16:53:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.257 2010/11/16 12:14:41 vapier Exp $
+
+ 16 Nov 2010; Mike Frysinger <vapier@gentoo.org> busybox-1.17.1-r1.ebuild:
+ Disable USE=pam when building the static rescue shell #345665 by Paweł
+ Hajdan jr.
28 Sep 2010; Mike Frysinger <vapier@gentoo.org> busybox-1.17.1-r1.ebuild,
+files/busybox-1.17.1-date.patch, +files/busybox-1.17.1-grep.patch:
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/busybox: busybox-1.17.1-r1.ebuild ChangeLog
@ 2010-09-28 16:53 Mike Frysinger (vapier)
0 siblings, 0 replies; 3+ messages in thread
From: Mike Frysinger (vapier) @ 2010-09-28 16:53 UTC (permalink / raw
To: gentoo-commits
vapier 10/09/28 16:53:47
Modified: busybox-1.17.1-r1.ebuild ChangeLog
Log:
Move .config setup to src_prepare, fix from upstream for nano timestamps #335947 by Sergio Costas, and propagate strict aliasing workaround for stable preparation.
(Portage version: 2.2_rc86/cvs/Linux x86_64)
Revision Changes Path
1.2 sys-apps/busybox/busybox-1.17.1-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/busybox-1.17.1-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/busybox-1.17.1-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/busybox-1.17.1-r1.ebuild?r1=1.1&r2=1.2
Index: busybox-1.17.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.17.1-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- busybox-1.17.1-r1.ebuild 16 Aug 2010 21:23:57 -0000 1.1
+++ busybox-1.17.1-r1.ebuild 28 Sep 2010 16:53:47 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.17.1-r1.ebuild,v 1.1 2010/08/16 21:23:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.17.1-r1.ebuild,v 1.2 2010/09/28 16:53:47 vapier Exp $
EAPI=2
inherit eutils flag-o-matic savedconfig toolchain-funcs
@@ -81,6 +81,7 @@
src_prepare() {
unset KBUILD_OUTPUT #88088
+ append-flags -fno-strict-aliasing #310413
# patches go here!
epatch "${FILESDIR}"/busybox-1.17.0-bb.patch
@@ -98,7 +99,9 @@
-e "/^CC/s:=.*:= $(tc-getCC):" \
-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
Makefile || die
+}
+src_configure() {
# check for a busybox config before making one of our own.
# if one exist lets return and use it.
1.256 sys-apps/busybox/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/ChangeLog?rev=1.256&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/ChangeLog?rev=1.256&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/ChangeLog?r1=1.255&r2=1.256
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -r1.255 -r1.256
--- ChangeLog 22 Aug 2010 17:34:06 -0000 1.255
+++ ChangeLog 28 Sep 2010 16:53:47 -0000 1.256
@@ -1,6 +1,12 @@
# ChangeLog for sys-apps/busybox
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.255 2010/08/22 17:34:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.256 2010/09/28 16:53:47 vapier Exp $
+
+ 28 Sep 2010; Mike Frysinger <vapier@gentoo.org> busybox-1.17.1-r1.ebuild,
+ +files/busybox-1.17.1-date.patch, +files/busybox-1.17.1-grep.patch:
+ Move .config setup to src_prepare, fix from upstream for nano timestamps
+ #335947 by Sergio Costas, and propagate strict aliasing workaround for
+ stable preparation.
22 Aug 2010; Mike Frysinger <vapier@gentoo.org>
+files/busybox-1.17.1-make.patch:
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/busybox: busybox-1.17.1-r1.ebuild ChangeLog
@ 2010-08-16 21:23 Mike Frysinger (vapier)
0 siblings, 0 replies; 3+ messages in thread
From: Mike Frysinger (vapier) @ 2010-08-16 21:23 UTC (permalink / raw
To: gentoo-commits
vapier 10/08/16 21:23:57
Modified: ChangeLog
Added: busybox-1.17.1-r1.ebuild
Log:
Add more fixes from upstream, and fix default shell config #333005 by Eugene Shalygin.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.254 sys-apps/busybox/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/ChangeLog?rev=1.254&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/ChangeLog?rev=1.254&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/ChangeLog?r1=1.253&r2=1.254
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -r1.253 -r1.254
--- ChangeLog 15 Aug 2010 17:29:24 -0000 1.253
+++ ChangeLog 16 Aug 2010 21:23:57 -0000 1.254
@@ -1,6 +1,13 @@
# ChangeLog for sys-apps/busybox
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.253 2010/08/15 17:29:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.254 2010/08/16 21:23:57 vapier Exp $
+
+*busybox-1.17.1-r1 (16 Aug 2010)
+
+ 16 Aug 2010; Mike Frysinger <vapier@gentoo.org> +busybox-1.17.1-r1.ebuild,
+ +files/busybox-1.17.1-mdev.patch, files/busybox-1.17.1-sed.patch:
+ Add more fixes from upstream, and fix default shell config #333005 by Eugene
+ Shalygin.
15 Aug 2010; Mike Frysinger <vapier@gentoo.org> busybox-1.17.1.ebuild:
Disable rfkill by default #332803 by Hans Nieser.
1.1 sys-apps/busybox/busybox-1.17.1-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/busybox-1.17.1-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/busybox-1.17.1-r1.ebuild?rev=1.1&content-type=text/plain
Index: busybox-1.17.1-r1.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.17.1-r1.ebuild,v 1.1 2010/08/16 21:23:57 vapier Exp $
EAPI=2
inherit eutils flag-o-matic savedconfig toolchain-funcs
################################################################################
# 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=keepwork so the work directory won't
# get erased afterwards. Add a definition like ROOT=/my/root/path to the
# start of the line if you're installing to somewhere else than the root
# 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 location
# where the config file was saved.
#
# FEATURES=keepwork USE=savedconfig emerge busybox
#
# (2) Go to the work directory and change the configuration of busybox using 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.eclass
#
# (4) Emerge busybox with USE=savedconfig to use the configuration file you
# just generated.
#
################################################################################
#
# (1) Alternatively skip the above steps and simply emerge busybox without
# USE=savedconfig.
#
# (2) Edit the file it saves by hand. ${ROOT}"/etc/portage/savedconfig/${CATEGORY}/${PF}
#
# (3) Remerge busybox as using USE=savedconfig.
#
################################################################################
#SNAPSHOT=20040726
SNAPSHOT=""
DESCRIPTION="Utilities for rescue and embedded systems"
HOMEPAGE="http://www.busybox.net/"
if [[ -n ${SNAPSHOT} ]] ; then
MY_P=${PN}
SRC_URI="http://www.busybox.net/downloads/snapshots/${PN}-${SNAPSHOT}.tar.bz2"
else
MY_P=${PN}-${PV/_/-}
SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2"
fi
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
IUSE="debug ipv6 make-symlinks +mdev -pam selinux static elibc_glibc"
RESTRICT="test"
DEPEND="selinux? ( sys-libs/libselinux )
pam? ( sys-libs/pam )"
S=${WORKDIR}/${MY_P}
busybox_config_option() {
case $1 in
y) sed -i -e "s:.*\<CONFIG_$2\>.*set:CONFIG_$2=y:g" .config;;
n) sed -i -e "s:CONFIG_$2=y:# 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[= ]" .config || echo Could not find CONFIG_$2 ...)
}
src_prepare() {
unset KBUILD_OUTPUT #88088
# patches go here!
epatch "${FILESDIR}"/busybox-1.17.0-bb.patch
epatch "${FILESDIR}"/busybox-${PV}-*.patch
# 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 "/^CC/s:=.*:= $(tc-getCC):" \
-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
Makefile || die
# 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
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 NOMMU
busybox_config_option n MONOTONIC_SYSCALL
# 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='static pam'. Assuming static is more important."
fi
use static \
&& busybox_config_option n PAM \
|| busybox_config_option pam PAM
busybox_config_option static STATIC
busybox_config_option debug DEBUG
use debug \
&& busybox_config_option y NO_DEBUG_LIB \
&& busybox_config_option n DMALLOC \
&& busybox_config_option n EFENCE
busybox_config_option selinux SELINUX
# default a bunch of uncommon options to off
local opt
for opt in \
CRONTAB \
DC DEVFSD DNSD DPKG \
FAKEIDENTD FBSPLASH FOLD FTP{GET,PUT} \
HOSTID HUSH \
INETD INOTIFYD IPCALC \
LASH LOCALE_SUPPORT LOGNAME LPD \
MSH \
OD \
RFKILL \
SLATTACH SULOGIN \
TASKSET TCPSVD \
RPM RPM2CPIO \
UDPSVD UUDECODE UUENCODE
do
busybox_config_option n ${opt}
done
emake -j1 oldconfig > /dev/null
}
src_compile() {
unset KBUILD_OUTPUT #88088
export SKIP_STRIP=y
emake busybox || die "build failed"
if ! use static && ! use pam ; then
mv busybox_unstripped{,.bak}
emake CONFIG_STATIC=y busybox || die "static build failed"
mv busybox_unstripped bb
mv busybox_unstripped{.bak,}
fi
}
src_install() {
unset KBUILD_OUTPUT #88088
save_config .config
into /
newbin busybox_unstripped busybox || die
if use static || use pam ; then
dosym busybox /bin/bb || die
dosym bb /bin/busybox.static || die
else
dobin bb || die
fi
if use mdev; then
dodir /$(get_libdir)/mdev/
use make-symlinks || dosym /bin/bb /sbin/mdev
cp "${S}"/examples/mdev_fat.conf "${D}"/etc/mdev.conf
exeinto /$(get_libdir)/mdev/
doexe "${FILESDIR}"/mdev/*
insinto /$(get_libdir)/rcscripts/addons
doins "${FILESDIR}"/mdev-start.sh || die
newinitd "${FILESDIR}"/mdev.rc mdev || die
fi
# bundle up the symlink files for use later
emake install || die
rm _install/bin/busybox
tar cf busybox-links.tar -C _install . || : #;die
insinto /usr/share/${PN}
doins busybox-links.tar || die
newins .config ${PF}.config || die
dodoc AUTHORS README TODO
cd docs || die
docinto txt
dodoc *.txt
docinto pod
dodoc *.pod
dohtml *.html
cd ../examples || die
docinto examples
dodoc inittab depmod.pl *.conf *.script undeb unrpm
cd bootfloppy || die
docinto bootfloppy
dodoc $(find . -type f)
}
pkg_preinst() {
if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then
ewarn "setting USE=make-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 probably ok."
ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is realy what you want."
die "silly options will destroy your system"
fi
if use make-symlinks ; then
mv "${D}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
fi
}
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
echo
einfo "This ebuild has support for user defined configs"
einfo "Please read this ebuild for more details and re-emerge as needed"
einfo "if you want to add or remove functionality for ${PN}"
echo
}
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-11-16 12:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-11-16 12:14 [gentoo-commits] gentoo-x86 commit in sys-apps/busybox: busybox-1.17.1-r1.ebuild ChangeLog Mike Frysinger (vapier)
-- strict thread matches above, loose matches on Subject: below --
2010-09-28 16:53 Mike Frysinger (vapier)
2010-08-16 21:23 Mike Frysinger (vapier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox