split the insmod patches so we can apply the alpha/hppa support patch to 1.01 and...

Package-Manager: portage-2.0.51.22-r2

diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index f90a2f402da1f7fd97e264f9d052ab5637ba0392..c835010dfbd62b46b51550c9a73c773b4d285d17 100644 (file)
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -3,8 +3,8 @@ Hash: SHA1
 
 MD5 7544fceeb5eaefc424889d4651850237 busybox-1.1_pre20050802.ebuild 6334
 MD5 8ef75eba39772bdd1a8facc7815dbebb metadata.xml 161
-MD5 be460e4011a4120de6c9f96b078a76b2 busybox-1.00-r4.ebuild 7034
-MD5 cd5b1fbeab389499da40e26e40bbf931 busybox-1.01.ebuild 6872
+MD5 fe2861ddcc79aa407758c05886aee1e0 busybox-1.00-r4.ebuild 7084
+MD5 1dad6f571e1a8d34c2aa521ce6b3f50c busybox-1.01.ebuild 6924
 MD5 67d9008dfb895deda9cc7b5d1fc27a26 ChangeLog 13662
 MD5 8eca6aae55dad92090e0136b58a9fcf7 files/digest-busybox-1.00-r4 142
 MD5 4bd102f0f2dae4271f441ca0d53c33c9 files/digest-busybox-1.01 141
@@ -12,19 +12,20 @@ MD5 d9841a0171170d16bb121c696591e7ef files/config-netboot 9853
 MD5 c6ef5df865f1dd6a2f4d1200184a366b files/digest-busybox-1.1_pre20050802 70
 MD5 1587853e73bcbda7157048299fc659fe files/1.00/busybox-read-timeout.patch 1964
 MD5 e4391db361a2ab2985811ec466f08cdc files/1.00/standalone.patch 1007
+MD5 c5891798e8da55d3441b5361b62ee377 files/1.00/fix-amd64-insmod.patch 427
 MD5 4972a3b12accd80b77304ff4ff6b6a3a files/1.00/cp-posix-opts.patch 1245
 MD5 593c8f8e26c0a381db171d9be08076c0 files/1.00/sum.patch 6723
 MD5 8a3287074aab50454f7785651ddea71c files/1.00/gcc4.patch 632
 MD5 f16657b6a3bf9602a65dbb5f431afbda files/1.00/readlink-follow.patch 2795
 MD5 81f4a0289354f964e744acb2f74c1894 files/1.00/bash-tests.patch 1474
 MD5 6209b38225ac1d7cc77f84799acbe3ca files/1.00/nice.patch 4571
-MD5 85560a8d547bfc101acf98d53dbecd45 files/1.00/more-insmod-arches.patch 1506
+MD5 42df6649bab3689e562877edf2694f04 files/1.00/more-insmod-arches.patch 1079
 MD5 0e50cd0ad938a8c15f1af8b59028c959 files/1.00/printenv.patch 3365
 MD5 02bde866363ce5357e8dfadcf870b230 files/1.00/bb.patch 155
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDC7+ygIKl8Uu19MoRAmaoAJ9tSN1yzwl5rZauCzfMwYVxvTsP1gCggJ9H
-tE89Ip061T/GYycK2BRY070=
-=jhxp
+iD8DBQFDJ2n5gIKl8Uu19MoRAuPKAJwKyyre5xSIBbXDe/OmpQ2shJPThwCggJrp
+ACSIg7nKRD36jJW2WLG4inI=
+=k/Ji
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/busybox/busybox-1.00-r4.ebuild b/sys-apps/busybox/busybox-1.00-r4.ebuild
index ffd66d85fa5b27c832a0627269442d3cf6c0a13f..5b08174e6db58cdea23bc1e474019f7574fa0cd0 100644 (file)
--- a/sys-apps/busybox/busybox-1.00-r4.ebuild
+++ b/sys-apps/busybox/busybox-1.00-r4.ebuild
@@ -1,6 +1,6 @@
 # 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-r4.ebuild,v 1.16 2005/08/24 00:29:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.00-r4.ebuild,v 1.17 2005/09/14 00:08:09 vapier Exp $
 
 inherit eutils
 
@@ -60,6 +60,7 @@ src_unpack() {
        epatch "${FILESDIR}"/1.00/busybox-read-timeout.patch
        epatch "${FILESDIR}"/1.00/readlink-follow.patch
        epatch "${FILESDIR}"/1.00/more-insmod-arches.patch
+       epatch "${FILESDIR}"/1.00/fix-amd64-insmod.patch
        epatch "${FILESDIR}"/1.00/bash-tests.patch
        epatch "${FILESDIR}"/1.00/cp-posix-opts.patch
        epatch "${FILESDIR}"/1.00/standalone.patch

diff --git a/sys-apps/busybox/busybox-1.01.ebuild b/sys-apps/busybox/busybox-1.01.ebuild
index cc669aed287461ff7ccffcf9f4938ec8aafba8f6..a784708d6c13ccc41930b06addc0f13859b07193 100644 (file)
--- a/sys-apps/busybox/busybox-1.01.ebuild
+++ b/sys-apps/busybox/busybox-1.01.ebuild
@@ -1,6 +1,6 @@
 # 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.01.ebuild,v 1.2 2005/08/24 00:29:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.01.ebuild,v 1.3 2005/09/14 00:08:09 vapier Exp $
 
 inherit eutils
 
@@ -59,6 +59,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
        epatch "${FILESDIR}"/1.00/bash-tests.patch
        epatch "${FILESDIR}"/1.00/standalone.patch
        epatch "${FILESDIR}"/1.00/nice.patch

diff --git a/sys-apps/busybox/files/1.00/fix-amd64-insmod.patch b/sys-apps/busybox/files/1.00/fix-amd64-insmod.patch
new file mode 100644 (file)
index 0000000..8d60f06
--- /dev/null
+++ b/sys-apps/busybox/files/1.00/fix-amd64-insmod.patch
@@ -0,0 +1,15 @@
+Index: modutils/insmod.c
+===================================================================
+--- modutils/insmod.c  (revision 9620)
++++ modutils/insmod.c  (revision 10061)
+@@ -290,8 +290,8 @@
+ /* X86_64  */
+ #if defined(__x86_64__)
+ #define MATCH_MACHINE(x) (x == EM_X86_64)
+-#define SHT_RELM      SHT_REL
+-#define Elf64_RelM    Elf64_Rel
++#define SHT_RELM      SHT_RELA
++#define Elf64_RelM    Elf64_Rela
+ #define ELFCLASSM     ELFCLASS64
+ #endif
+ 

diff --git a/sys-apps/busybox/files/1.00/more-insmod-arches.patch b/sys-apps/busybox/files/1.00/more-insmod-arches.patch
index 42e1f88708bdd6c8eae990353e765cb0717ffe22..3056942b94a11d02cda1b0a0b5db1d27e8954251 100644 (file)
--- a/sys-apps/busybox/files/1.00/more-insmod-arches.patch
+++ b/sys-apps/busybox/files/1.00/more-insmod-arches.patch
@@ -41,18 +41,3 @@ diff -u -r1.125 -r1.126
  /* H8/300 */
  #if defined(__H8300H__) || defined(__H8300S__)
  #define MATCH_MACHINE(x) (x == EM_H8_300)
-Index: modutils/insmod.c
-===================================================================
---- modutils/insmod.c  (revision 9620)
-+++ modutils/insmod.c  (revision 10061)
-@@ -290,8 +290,8 @@
- /* X86_64  */
- #if defined(__x86_64__)
- #define MATCH_MACHINE(x) (x == EM_X86_64)
--#define SHT_RELM      SHT_REL
--#define Elf64_RelM    Elf64_Rel
-+#define SHT_RELM      SHT_RELA
-+#define Elf64_RelM    Elf64_Rela
- #define ELFCLASSM     ELFCLASS64
- #endif
-