diff options
author | Raúl Porcel <armin76@gentoo.org> | 2011-12-11 17:22:34 +0000 |
---|---|---|
committer | Raúl Porcel <armin76@gentoo.org> | 2011-12-11 17:22:34 +0000 |
commit | 56c794a250c99da13ba6b6c9f0678d922efa7e1f (patch) | |
tree | 8fe4d2a1b59cedfb7ff7db6641a0bfa53e6856d9 /sys-boot | |
parent | Version bump wrt bug #393423 (diff) | |
download | historical-56c794a250c99da13ba6b6c9f0678d922efa7e1f.tar.gz historical-56c794a250c99da13ba6b6c9f0678d922efa7e1f.tar.bz2 historical-56c794a250c99da13ba6b6c9f0678d922efa7e1f.zip |
Add patch to fix build failure with glibc-2.13, patch by Sergei Trofimovich <slyfox at gentoo dot org>, bug #364697
Package-Manager: portage-2.1.10.38/cvs/Linux ia64
Diffstat (limited to 'sys-boot')
-rw-r--r-- | sys-boot/aboot/ChangeLog | 8 | ||||
-rw-r--r-- | sys-boot/aboot/Manifest | 15 | ||||
-rw-r--r-- | sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild | 5 | ||||
-rw-r--r-- | sys-boot/aboot/files/aboot-define_stat_only_in_userspace.patch | 35 |
4 files changed, 59 insertions, 4 deletions
diff --git a/sys-boot/aboot/ChangeLog b/sys-boot/aboot/ChangeLog index f50ad5c893ca..904ace460c05 100644 --- a/sys-boot/aboot/ChangeLog +++ b/sys-boot/aboot/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-boot/aboot # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/aboot/ChangeLog,v 1.17 2011/04/02 12:00:39 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/aboot/ChangeLog,v 1.18 2011/12/11 17:22:34 armin76 Exp $ + + 11 Dec 2011; Raúl Porcel <armin76@gentoo.org> + aboot-1.0_pre20040408-r3.ebuild, + +files/aboot-define_stat_only_in_userspace.patch: + Add patch to fix build failure with glibc-2.13, patch by Sergei Trofimovich + <slyfox at gentoo dot org>, bug #364697 02 Apr 2011; Raúl Porcel <armin76@gentoo.org> aboot-1.0_pre20040408-r3.ebuild: diff --git a/sys-boot/aboot/Manifest b/sys-boot/aboot/Manifest index 62cbc3d4410c..e4f5c27503fc 100644 --- a/sys-boot/aboot/Manifest +++ b/sys-boot/aboot/Manifest @@ -1,9 +1,20 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX aboot-define_stat_only_in_userspace.patch 930 RMD160 0252234d6702ce8872cbb1d52ec5b397dd82163d SHA1 7d048dd7e7ac4068ccc16a5952df251f877ad1d9 SHA256 ba7b34d1361ff4635e0f4aa7118295d4b93fc8716333a23bbc8a4dbe4ddea5de AUX aboot-gcc-3.4.patch 830 RMD160 cd9f8a40a648f596fd710dfc9b2057cd481b90a7 SHA1 de8f0f5d586ba25670c6e17fb553a1a90ddf909c SHA256 9757c85226ec5355a849a24a71415604569a7de06036bcfb3e4814fa448b5d18 AUX aboot-pt_note.patch 8966 RMD160 80d855199f2e4ca8b89858792a3c5f91ea8868b0 SHA1 05581a21648d550f89422ec7f4c93f77d7c2e259 SHA256 ef8a8e20bf482d0aa2cd4da09c867f021018fde486f6c631d7c236d790d81a2b AUX aboot.conf 295 RMD160 d42e05161680a9d6f4da91b863737d05d3c72e63 SHA1 36760127c59e3d6c804320f931642033bb4a33e6 SHA256 41372b883807cbd871a5c8f17c4787273f2107ba10be127f73ca9e445ce72ebd DIST aboot-1.0_pre20040408.tar.bz2 115062 RMD160 7ba6619e6cee1d570b5df806a1dbd23b2918303b SHA1 7275dd8435ba4c36aa37e77eebea8b561751d4d4 SHA256 a8ae8f2bf549c1cc79ea66a0a11c8db5c0257ce0d94b97418eb1c658723b12d2 DIST aboot_gentoo.diff.bz2 9527 RMD160 7e70f37a20f2de262ae8136d65c59c384ba700b0 SHA1 534dc10c6d720a06a3f79b0533e3e2624f8a980a SHA256 6b141b7c90560d07ad740cfb8660a26935acfa96376e73439271d1fa9c6d0730 DIST gentoo-headers-base-2.6.22.tar.bz2 4700338 RMD160 0742adecc4cf093a2df13c61c3d11e7566f08a9d SHA1 15d4b0508dd871032fe46e15074297f956c768e6 SHA256 da57d0d8d12a59b05f0d3851e6d2f67c413baece046f4ec03831aa70df88710a -EBUILD aboot-1.0_pre20040408-r3.ebuild 2529 RMD160 92a5b743e9d5abb90ed648febfcb4b6bb70de956 SHA1 e6518b12e706bbcf21597a18759cf203173c19e6 SHA256 3d5961a8e41e2cf9e8056521d021b0963d53dcd93d1f1c29dd442b5712e8169c -MISC ChangeLog 3068 RMD160 7f1e319737b2b832ab9206b7d2eaa1c7cfe3156e SHA1 a3d451da20825f0c4b7a31bcecafafbbbc9f8ea6 SHA256 70fc2df16589d7cb3c9adf35d14e46962b79148b5ce01e7291e647d832037dd1 +EBUILD aboot-1.0_pre20040408-r3.ebuild 2608 RMD160 940b7b8289d51e3f49380a8c6189cd91e6da39d4 SHA1 25d9a32ce3e57bb7ba955a99c25f71f4bee15e7b SHA256 6a1b63029ba7e8b6492c77e94126e4978596043465b3d2b281ffd8b49c4cd796 +MISC ChangeLog 3325 RMD160 9cd8c9c0f84a8a1999a316b178f7e1c55cf21c98 SHA1 05a57ef2f6543b71590dca8d5d80f4c39559fcee SHA256 6c9ce9b70745de0d014bdbe6265dacce50df11741554b0f4836f32ee6461ee20 MISC metadata.xml 158 RMD160 e1feed743ecd0f7a4a2abedbef6a662b46969096 SHA1 8a107bbabbd7c2200a345c2e16e8e567d6cefe74 SHA256 6d4f913890738e4843f53f9de89e64faa5eb7d52cbe4c1040693f8ec56d19a31 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iEYEARECAAYFAk7k5uAACgkQuQc30/atMkAaAACeLKxwFFb4vVve6VQLIqw5jqWv +fikAoIfyNprfenmkGsbw2OCldOKlRgL7 +=UcTC +-----END PGP SIGNATURE----- diff --git a/sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild b/sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild index fa6ec4433dcd..b522b43a2bd0 100644 --- a/sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild +++ b/sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild,v 1.3 2011/04/02 12:00:39 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild,v 1.4 2011/12/11 17:22:34 armin76 Exp $ inherit eutils @@ -31,6 +31,9 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}/aboot-gcc-3.4.patch" epatch "${FILESDIR}/aboot-pt_note.patch" + # Bug 364697 + epatch "${FILESDIR}/aboot-define_stat_only_in_userspace.patch" + # Modified patch from Debian to add netboot support epatch "${WORKDIR}"/aboot_gentoo.diff } diff --git a/sys-boot/aboot/files/aboot-define_stat_only_in_userspace.patch b/sys-boot/aboot/files/aboot-define_stat_only_in_userspace.patch new file mode 100644 index 000000000000..5b0b5e0efedf --- /dev/null +++ b/sys-boot/aboot/files/aboot-define_stat_only_in_userspace.patch @@ -0,0 +1,35 @@ +# Patch by Sergei Trofimovich +# http://bugs.gentoo.org/364697 + +diff --git a/Makefile b/Makefile +index bbe3b60..b4245af 100644 +--- a/Makefile ++++ b/Makefile +@@ -138,10 +138,10 @@ distclean: clean + find . -name \*~ | xargs rm -f + + lib/%: +- make -C lib $* CPPFLAGS="$(CPPFLAGS)" TESTING="$(TESTING)" ++ make -C lib $* CPPFLAGS="$(CPPFLAGS) -D__KERNEL__" TESTING="$(TESTING)" + + tools/%: +- make -C tools $* CPPFLAGS="$(CPPFLAGS)" ++ make -C tools $* CPPFLAGS="$(CPPFLAGS) -U__KERNEL__" + + sdisklabel/%: + make -C sdisklabel $* CPPFLAGS="$(CPPFLAGS)" +diff --git a/include/isolib.h b/include/isolib.h +index 392327a..0ef6e2a 100644 +--- a/include/isolib.h ++++ b/include/isolib.h +@@ -7,7 +7,10 @@ + # define fd_set kernel_fd_set + #endif + ++#ifdef __KERNEL__ ++/* userspace stuff has it's own struct stat */ + #include <asm/stat.h> ++#endif + + extern int iso_read_super (void * data, int quiet); + extern int iso_open (const char * filename); |