diff options
author | Danny van Dyk <kugelfang@gentoo.org> | 2004-06-11 20:13:18 +0000 |
---|---|---|
committer | Danny van Dyk <kugelfang@gentoo.org> | 2004-06-11 20:13:18 +0000 |
commit | 54a6349910bdd36e328914fdb99c47aeea7884cf (patch) | |
tree | f44b541d84b219e792942da5fa42be06d5790f7f /sys-apps/busybox | |
parent | Added ~amd64. Fixed duplicate line in init file. (Manifest recommit) (diff) | |
download | gentoo-2-54a6349910bdd36e328914fdb99c47aeea7884cf.tar.gz gentoo-2-54a6349910bdd36e328914fdb99c47aeea7884cf.tar.bz2 gentoo-2-54a6349910bdd36e328914fdb99c47aeea7884cf.zip |
Fixed BUG #53658.
Diffstat (limited to 'sys-apps/busybox')
-rw-r--r-- | sys-apps/busybox/ChangeLog | 9 | ||||
-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-0.60.5-r1.ebuild | 4 | ||||
-rw-r--r-- | sys-apps/busybox/busybox-0.60.5-r2.ebuild | 4 | ||||
-rw-r--r-- | sys-apps/busybox/busybox-1.00_pre8.ebuild | 8 | ||||
-rw-r--r-- | sys-apps/busybox/files/busybox-1.00_pre8-amd64.patch | 32 |
7 files changed, 53 insertions, 12 deletions
diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog index 07c0d228f081..8c2380800e7c 100644 --- a/sys-apps/busybox/ChangeLog +++ b/sys-apps/busybox/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-apps/busybox # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.28 2004/05/10 21:05:50 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.29 2004/06/11 20:13:18 kugelfang Exp $ + + 11 Jun 2004; Danny van Dyk <kugelfang@gentoo.org> + +files/busybox-1.00_pre8-amd64.patch, busybox-0.60.3-r1.ebuild, + busybox-0.60.3-r2.ebuild, busybox-0.60.5-r1.ebuild, + busybox-0.60.5-r2.ebuild, busybox-1.00_pre8.ebuild: + Marked all versions -amd64, except -1.00_pre8. Added patch to make the latter + work on amd64. 10 May 2004; Michael Sterrett <mr_bones_@gentoo.org> busybox-0.50.ebuild, busybox-0.60.2.ebuild, busybox-0.60.3.ebuild, busybox-0.60.5.ebuild, diff --git a/sys-apps/busybox/busybox-0.60.3-r1.ebuild b/sys-apps/busybox/busybox-0.60.3-r1.ebuild index 3d783e83411d..5d8fd2e5474e 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 Technologies, Inc. # 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.5 2004/02/04 00:07:15 solar Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.3-r1.ebuild,v 1.6 2004/06/11 20:13:18 kugelfang Exp $ S=${WORKDIR}/${P} DESCRIPTION="Utilities for rescue and embedded systems" @@ -9,7 +9,7 @@ HOMEPAGE="http://www.busybox.net" SLOT="0" LICENSE="GPL-2" -KEYWORDS="x86 amd64 ppc sparc ~alpha" +KEYWORDS="x86 -amd64 ppc sparc ~alpha" DEPEND="virtual/glibc" diff --git a/sys-apps/busybox/busybox-0.60.3-r2.ebuild b/sys-apps/busybox/busybox-0.60.3-r2.ebuild index 5970ae781ee0..b8a4f689184f 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 Technologies, Inc. # 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.2 2004/04/27 21:02:42 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.3-r2.ebuild,v 1.3 2004/06/11 20:13:18 kugelfang Exp $ inherit eutils @@ -11,7 +11,7 @@ HOMEPAGE="http://www.busybox.net" SLOT="0" LICENSE="GPL-2" -KEYWORDS="-* sparc" +KEYWORDS="-* sparc -amd64" DEPEND="virtual/glibc" diff --git a/sys-apps/busybox/busybox-0.60.5-r1.ebuild b/sys-apps/busybox/busybox-0.60.5-r1.ebuild index d398e34a57c2..aaee428124b8 100644 --- a/sys-apps/busybox/busybox-0.60.5-r1.ebuild +++ b/sys-apps/busybox/busybox-0.60.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.5-r1.ebuild,v 1.9 2004/02/04 00:07:15 solar Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.5-r1.ebuild,v 1.10 2004/06/11 20:13:18 kugelfang Exp $ S=${WORKDIR}/${P} DESCRIPTION="Utilities for rescue and embedded systems" @@ -9,7 +9,7 @@ HOMEPAGE="http://www.busybox.net" SLOT="0" LICENSE="GPL-2" -KEYWORDS="~x86 amd64 -alpha" +KEYWORDS="~x86 -amd64 -alpha" IUSE="static uclibc" DEPEND="virtual/glibc" diff --git a/sys-apps/busybox/busybox-0.60.5-r2.ebuild b/sys-apps/busybox/busybox-0.60.5-r2.ebuild index 2455e5d5c17f..0eff66bdffd9 100644 --- a/sys-apps/busybox/busybox-0.60.5-r2.ebuild +++ b/sys-apps/busybox/busybox-0.60.5-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.5-r2.ebuild,v 1.6 2004/05/25 01:36:52 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.5-r2.ebuild,v 1.7 2004/06/11 20:13:18 kugelfang Exp $ inherit flag-o-matic eutils @@ -10,7 +10,7 @@ SRC_URI="http://www.busybox.net/downloads/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~x86 arm ~amd64 -alpha" +KEYWORDS="~x86 arm -amd64 -alpha" IUSE="static uclibc diet devfs" DEPEND="virtual/glibc diff --git a/sys-apps/busybox/busybox-1.00_pre8.ebuild b/sys-apps/busybox/busybox-1.00_pre8.ebuild index 64c805c5e080..af459ea3fe02 100644 --- a/sys-apps/busybox/busybox-1.00_pre8.ebuild +++ b/sys-apps/busybox/busybox-1.00_pre8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.00_pre8.ebuild,v 1.3 2004/05/25 01:36:52 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.00_pre8.ebuild,v 1.4 2004/06/11 20:13:18 kugelfang Exp $ MY_PV=${PV/_/-} MY_P=${PN}-${MY_PV} @@ -11,11 +11,11 @@ SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~x86 ~ppc arm" +KEYWORDS="~x86 ~ppc arm ~amd64" IUSE="debug static uclibc savedconfig make-busybox-symlinks" DEPEND="virtual/glibc - uclibc? ( dev-libs/uclibc )" + !amd64? ( uclibc? ( dev-libs/uclibc ) )" RDEPEND="!static? ( ${DEPEND} )" # <pebenito> then eventually turning on selinux would mean # adding a dep: selinux? ( sys-libs/libselinux ) @@ -34,6 +34,8 @@ src_unpack() { unpack ${A} cd ${S} + use amd64 && epatch ${FILESDIR}/${P}-amd64.patch + # check for a busybox config before making one of our own. # if one exist lets return and use it. # fine grained config control for user defined busybox configs. diff --git a/sys-apps/busybox/files/busybox-1.00_pre8-amd64.patch b/sys-apps/busybox/files/busybox-1.00_pre8-amd64.patch new file mode 100644 index 000000000000..3f53d52f228d --- /dev/null +++ b/sys-apps/busybox/files/busybox-1.00_pre8-amd64.patch @@ -0,0 +1,32 @@ +--- modutils/insmod.c.orig 2004-06-11 20:36:37.684227544 +0200 ++++ modutils/insmod.c 2004-06-11 20:36:58.307092392 +0200 +@@ -152,6 +152,18 @@ + #define ELFCLASSM ELFCLASS32 + #endif + ++#if defined(__x86_64__) ++#define BB_USE_GOT_ENTRIES ++#define BB_GOT_ENTRY_SIZE 8 ++#define BB_USE_SINGLE ++ ++#define MATCH_MACHINE(x) (x == EM_X86_64) ++ ++#define SHT_RELM SHT_RELA ++#define Elf64_RelM Elf64_Rela ++#define ELFCLASSM ELFCLASS64 ++#endif ++ + #if defined(__mc68000__) + #define CONFIG_USE_GOT_ENTRIES + #define CONFIG_GOT_ENTRY_SIZE 4 +--- util-linux/fdisk.c.orig 2004-06-11 20:49:01.141204904 +0200 ++++ util-linux/fdisk.c 2004-06-11 20:50:18.957375048 +0200 +@@ -855,7 +855,7 @@ + */ + + +-#if defined(__alpha__) || defined(__ia64__) || defined(__s390x__) ++#if defined(__alpha__) || defined(__ia64__) || defined(__s390x__) || defined(__x86_64__) + + #define my_llseek lseek + |