diff options
author | 2005-01-02 03:54:44 +0000 | |
---|---|---|
committer | 2005-01-02 03:54:44 +0000 | |
commit | a2fcbec4b771f491d5c0f12a06c8ac6c7f6e47a5 (patch) | |
tree | e87f4a73297186fcfef08beb1116d4e557a3b363 /sys-apps/busybox | |
parent | alpha/ia64/sh KEYWORDS (diff) | |
download | historical-a2fcbec4b771f491d5c0f12a06c8ac6c7f6e47a5.tar.gz historical-a2fcbec4b771f491d5c0f12a06c8ac6c7f6e47a5.tar.bz2 historical-a2fcbec4b771f491d5c0f12a06c8ac6c7f6e47a5.zip |
Add patch from upstream to support alpha/hppa.
Diffstat (limited to 'sys-apps/busybox')
-rw-r--r-- | sys-apps/busybox/ChangeLog | 8 | ||||
-rw-r--r-- | sys-apps/busybox/Manifest | 33 | ||||
-rw-r--r-- | sys-apps/busybox/busybox-0.60.3-r1.ebuild | 4 | ||||
-rw-r--r-- | sys-apps/busybox/busybox-0.60.3-r2.ebuild | 4 | ||||
-rw-r--r-- | sys-apps/busybox/busybox-1.00-r1.ebuild | 60 | ||||
-rw-r--r-- | sys-apps/busybox/busybox-1.00.ebuild | 4 | ||||
-rw-r--r-- | sys-apps/busybox/busybox-1.00_rc3.ebuild | 4 | ||||
-rw-r--r-- | sys-apps/busybox/files/1.00/more-insmod-arches.patch | 43 |
8 files changed, 99 insertions, 61 deletions
diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog index 636ac63579dc..b434afebd51d 100644 --- a/sys-apps/busybox/ChangeLog +++ b/sys-apps/busybox/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/busybox -# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.53 2004/12/31 11:48:11 gmsoft Exp $ +# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.54 2005/01/02 03:54:44 vapier Exp $ + + 01 Jan 2005; Mike Frysinger <vapier@gentoo.org> + +files/1.00/more-insmod-arches.patch, busybox-1.00-r1.ebuild: + Add patch from upstream to support alpha/hppa. 31 Dec 2004; Guy Martin <gmsoft@gentoo.org> busybox-1.00-r1.ebuild: Added needed symlink of /sbin/init for busybox when USE=netboot. diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest index 719f45ecae1a..8a2d53d7aa8e 100644 --- a/sys-apps/busybox/Manifest +++ b/sys-apps/busybox/Manifest @@ -1,25 +1,36 @@ -MD5 888eb5f455237af75855802f812258cd ChangeLog 10324 -MD5 f98f75be102af5709caff4cf84eaeb90 busybox-0.60.3-r1.ebuild 1091 -MD5 bb58878c35f17f5bad4aa060f1dcc25e busybox-0.60.3-r2.ebuild 1183 -MD5 e48e55f5e87dd96468d31015b7ea4df0 busybox-1.00.ebuild 6430 -MD5 018cbd9be3df7770b07423adc96925fb busybox-1.00-r1.ebuild 6652 -MD5 7e1760fa1735a63dee4793edbe327a29 busybox-1.00_rc3.ebuild 6487 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 dd2e24d56e4c955ba70214b481d48113 ChangeLog 10488 +MD5 bd53514006037cd4d88fa5b7bb9ede8e busybox-0.60.3-r1.ebuild 1090 +MD5 7c7ecdb7faae49f2740ad820e2bfe430 busybox-0.60.3-r2.ebuild 1181 +MD5 af139366511d706056d4d86332a43b08 busybox-1.00.ebuild 6430 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 +MD5 bad73a4877e9c1b0f263f52e703a0575 busybox-1.00-r1.ebuild 6100 +MD5 cd13848c8be3ae3af5b42b9d242b9865 busybox-1.00_rc3.ebuild 6487 MD5 9ce965b12114a360496fe06e952139a8 files/Config.h 11695 MD5 24ec3839ecb3e429bf29a819398b7753 files/Config.h-0.60.2-cd 13772 MD5 af127cfced92352c0a43cbf63cde52bd files/Config.h-0.60.3-cd 14319 MD5 1bce86c66f42d204c0780faee28004d6 files/Config.h-0.60.5-cd 14299 MD5 9af76647376bd7228609763aaad090e8 files/busybox-0.60.5-dietlibc.diff 13526 MD5 9167897ed0b558e714a92f7e2d2fe534 files/busybox-1.00-pre3.config 8804 -MD5 335f1c2b99e52e880f3a490df9be39da files/digest-busybox-1.00 66 -MD5 8eae5b311553ee77cda4524ab892468c files/busybox-1.00_rc3-amd64.patch 658 -MD5 4e80b04a6c57cb7341be774b55b7229c files/busybox-cmdedit-sparc.diff 568 +MD5 75d3d96c0d23ddd4ffae3daa59e0fb1e files/digest-busybox-1.00_rc3 70 MD5 61ecae720ff226b1e543f7c1d0900043 files/digest-busybox-0.60.3-r1 66 -MD5 61ecae720ff226b1e543f7c1d0900043 files/digest-busybox-0.60.3-r2 66 +MD5 335f1c2b99e52e880f3a490df9be39da files/digest-busybox-1.00 66 MD5 335f1c2b99e52e880f3a490df9be39da files/digest-busybox-1.00-r1 66 -MD5 75d3d96c0d23ddd4ffae3daa59e0fb1e files/digest-busybox-1.00_rc3 70 MD5 9750d4004e6507d35f9aa67d2785fdd3 files/dodeps 2015 MD5 3a4b93f7ec6f3aaade20029a81562b88 files/msh.diff 433 +MD5 4e80b04a6c57cb7341be774b55b7229c files/busybox-cmdedit-sparc.diff 568 +MD5 61ecae720ff226b1e543f7c1d0900043 files/digest-busybox-0.60.3-r2 66 MD5 d9841a0171170d16bb121c696591e7ef files/config-netboot 9853 +MD5 8eae5b311553ee77cda4524ab892468c files/busybox-1.00_rc3-amd64.patch 658 MD5 1587853e73bcbda7157048299fc659fe files/1.00/busybox-read-timeout.patch 1964 MD5 f16657b6a3bf9602a65dbb5f431afbda files/1.00/readlink-follow.patch 2795 +MD5 0935d76af47dda2deda0364f8c9018e3 files/1.00/more-insmod-arches.patch 1095 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.9.10 (GNU/Linux) + +iD8DBQFB13CRroRuSHgZdywRArEIAJ9wcLWt6LPcAemHU0Xk25bpZU8cIQCePyks +PJScbF/10LdkB98qvwnDSAU= +=QedS +-----END PGP SIGNATURE----- diff --git a/sys-apps/busybox/busybox-0.60.3-r1.ebuild b/sys-apps/busybox/busybox-0.60.3-r1.ebuild index 9a8a4118991a..954dd55683e6 100644 --- a/sys-apps/busybox/busybox-0.60.3-r1.ebuild +++ b/sys-apps/busybox/busybox-0.60.3-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.3-r1.ebuild,v 1.9 2004/06/30 14:32:31 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.3-r1.ebuild,v 1.10 2005/01/02 03:54:44 vapier Exp $ DESCRIPTION="Utilities for rescue and embedded systems" HOMEPAGE="http://www.busybox.net/" diff --git a/sys-apps/busybox/busybox-0.60.3-r2.ebuild b/sys-apps/busybox/busybox-0.60.3-r2.ebuild index 49b3a130792e..346cc61ca554 100644 --- a/sys-apps/busybox/busybox-0.60.3-r2.ebuild +++ b/sys-apps/busybox/busybox-0.60.3-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.3-r2.ebuild,v 1.6 2004/06/30 14:32:31 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.3-r2.ebuild,v 1.7 2005/01/02 03:54:44 vapier Exp $ inherit eutils diff --git a/sys-apps/busybox/busybox-1.00-r1.ebuild b/sys-apps/busybox/busybox-1.00-r1.ebuild index 8df17c43f996..31a18b00cea9 100644 --- a/sys-apps/busybox/busybox-1.00-r1.ebuild +++ b/sys-apps/busybox/busybox-1.00-r1.ebuild @@ -1,35 +1,33 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.00-r1.ebuild,v 1.4 2004/12/31 11:48:11 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.00-r1.ebuild,v 1.5 2005/01/02 03:54:44 vapier Exp $ inherit eutils -DESCRIPTION="Utilities for rescue and embedded systems" #SNAPSHOT=20040726 -HOMEPAGE="http://www.busybox.net/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~ppc ~mips ~arm ~amd64 ~sparc ~hppa" -IUSE="debug uclibc static savedconfig netboot make-busybox-symlinks" -MY_PV=${PV/_/-} - -if [ "$SNAPSHOT" != "" ]; then +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}-${MY_PV} + MY_P=${PN}-${PV/_/-} SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2" fi -S=${WORKDIR}/${MY_P} +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86" +IUSE="debug uclibc static savedconfig netboot make-busybox-symlinks" DEPEND="virtual/libc !amd64? ( uclibc? ( dev-libs/uclibc ) ) >=sys-apps/sed-4" RDEPEND="!static? ( virtual/libc )" +S=${WORKDIR}/${MY_P} + # <pebenito> then eventually turning on selinux would mean # adding a dep: selinux? ( sys-libs/libselinux ) @@ -50,6 +48,7 @@ src_unpack() { # patches for 1.00 go here. epatch ${FILESDIR}/1.00/busybox-read-timeout.patch epatch ${FILESDIR}/1.00/readlink-follow.patch + epatch ${FILESDIR}/1.00/more-insmod-arches.patch #bunzip #ftp://ftp.simtreas.ru/pub/my/bb/new/find.c.gz @@ -61,13 +60,7 @@ src_unpack() { # [package]-[version].config # [package].config - if use netboot ; then - cp ${FILESDIR}/config-netboot .config - sed -i \ - -e '/DEFAULT_SCRIPT/s:/share/udhcpc/default.script:/lib/udhcpc.script:' \ - networking/udhcp/libbb_udhcp.h \ - || die "fixing netboot/udhcpc" - elif use savedconfig ; then + if use savedconfig ; then [ -r .config ] && rm .config for conf in ${PN}-${PV}-${PR} ${PN}-${PV} ${PN}; do configfile=/etc/${PN}/${CHOST}/${conf}.config @@ -80,6 +73,12 @@ src_unpack() { einfo "Found your ${configfile} and using it." return 0 fi + elif use netboot ; then + cp ${FILESDIR}/config-netboot .config + sed -i \ + -e '/DEFAULT_SCRIPT/s:/share/udhcpc/default.script:/lib/udhcpc.script:' \ + networking/udhcp/libbb_udhcp.h \ + || die "fixing netboot/udhcpc" fi # busybox has changed quite a bit from 0.[5-6]* to 1.x so this @@ -111,25 +110,6 @@ src_unpack() { && busybox_config_option y DEBUG \ || busybox_config_option n DEBUG - # Supported architectures: - - # Busybox in general will build on any architecture supported by - # gcc. It has a few specialized features added for __sparc__ - # and __alpha__. insmod functionality is currently limited to - # x86, ARM, SH3/4, powerpc, m68k, MIPS, and v850e. - case ${ARCH} in - alpha|sparc*) - # non x86 needs to figure out what works for - # them the best. sparc64 bobmed while building - # ash in my tests - busybox_config_option n INSMOD - busybox_config_option n MODPROBE - busybox_config_option n RMMOD;; - hppa) - busybox_config_option n INSMOD;; - *) ;; - esac - #busybox_features=`grep CONFIG_ .config | tr '#' '\n' | # awk '{print $1}' | cut -d = -f 1 | grep -v ^$ | cut -c 8- | # tr [A-Z] [a-z] | awk '{print "busybox_"$1}'` diff --git a/sys-apps/busybox/busybox-1.00.ebuild b/sys-apps/busybox/busybox-1.00.ebuild index f15dd2023df8..12fff2ec2d13 100644 --- a/sys-apps/busybox/busybox-1.00.ebuild +++ b/sys-apps/busybox/busybox-1.00.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.00.ebuild,v 1.8 2004/12/14 03:49:33 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.00.ebuild,v 1.9 2005/01/02 03:54:44 vapier Exp $ inherit eutils diff --git a/sys-apps/busybox/busybox-1.00_rc3.ebuild b/sys-apps/busybox/busybox-1.00_rc3.ebuild index d0188cc43f44..697db37bb87a 100644 --- a/sys-apps/busybox/busybox-1.00_rc3.ebuild +++ b/sys-apps/busybox/busybox-1.00_rc3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.00_rc3.ebuild,v 1.13 2004/12/14 03:49:33 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.00_rc3.ebuild,v 1.14 2005/01/02 03:54:44 vapier Exp $ inherit eutils diff --git a/sys-apps/busybox/files/1.00/more-insmod-arches.patch b/sys-apps/busybox/files/1.00/more-insmod-arches.patch new file mode 100644 index 000000000000..7a88cb6fa31a --- /dev/null +++ b/sys-apps/busybox/files/1.00/more-insmod-arches.patch @@ -0,0 +1,43 @@ +Index: insmod.c +=================================================================== +RCS file: /var/cvs/busybox/modutils/insmod.c,v +retrieving revision 1.125 +retrieving revision 1.126 +diff -u -r1.125 -r1.126 +--- busybox/modutils/insmod.c 2 Sep 2004 23:03:25 -0000 1.125 ++++ busybox/modutils/insmod.c 26 Dec 2004 09:13:32 -0000 1.126 +@@ -109,6 +109,14 @@ + #endif + + ++/* Alpha */ ++#if defined(__alpha__) ++#define MATCH_MACHINE(x) (x == EM_ALPHA) ++#define SHT_RELM SHT_RELA ++#define Elf64_RelM Elf64_Rela ++#define ELFCLASSM ELFCLASS64 ++#endif ++ + /* ARM support */ + #if defined(__arm__) + #define MATCH_MACHINE(x) (x == EM_ARM) +@@ -135,6 +143,19 @@ + #endif + #endif + ++/* PA-RISC / HP-PA */ ++#if defined(__hppa__) ++#define MATCH_MACHINE(x) (x == EM_PARISC) ++#define SHT_RELM SHT_RELA ++#if defined(__LP64__) ++#define Elf64_RelM Elf64_Rela ++#define ELFCLASSM ELFCLASS64 ++#else ++#define Elf32_RelM Elf32_Rela ++#define ELFCLASSM ELFCLASS32 ++#endif ++#endif ++ + /* H8/300 */ + #if defined(__H8300H__) || defined(__H8300S__) + #define MATCH_MACHINE(x) (x == EM_H8_300) |