summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2013-12-11 13:17:58 +0000
committerChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2013-12-11 13:17:58 +0000
commit4b38e7e29e5d33ec3aa5037bf75c6277aeb29184 (patch)
tree5b9bf1508f1cd350b8f00dcb437f48f38dfeb4e7 /sys-boot
parentsci-mathematics/mlpy: Bump to EAPI=5 and distutils-r1.eclass (diff)
downloadgentoo-2-4b38e7e29e5d33ec3aa5037bf75c6277aeb29184.tar.gz
gentoo-2-4b38e7e29e5d33ec3aa5037bf75c6277aeb29184.tar.bz2
gentoo-2-4b38e7e29e5d33ec3aa5037bf75c6277aeb29184.zip
Bump to latest prerelease. Remove some old versions.
(Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'sys-boot')
-rw-r--r--sys-boot/syslinux/ChangeLog12
-rw-r--r--sys-boot/syslinux/files/syslinux-4.00-nopie.patch12
-rw-r--r--sys-boot/syslinux/files/syslinux-4.05-asneeded-linking-order.patch12
-rw-r--r--sys-boot/syslinux/syslinux-2.13.ebuild31
-rw-r--r--sys-boot/syslinux/syslinux-4.05.ebuild64
-rw-r--r--sys-boot/syslinux/syslinux-4.06.ebuild61
-rw-r--r--sys-boot/syslinux/syslinux-5.00.ebuild72
-rw-r--r--sys-boot/syslinux/syslinux-5.01.ebuild72
-rw-r--r--sys-boot/syslinux/syslinux-6.02_pre15.ebuild92
-rw-r--r--sys-boot/syslinux/syslinux-6.03_pre1.ebuild (renamed from sys-boot/syslinux/syslinux-6.02_pre16.ebuild)2
10 files changed, 12 insertions, 418 deletions
diff --git a/sys-boot/syslinux/ChangeLog b/sys-boot/syslinux/ChangeLog
index 4e13d3c97d9a..da993c05534e 100644
--- a/sys-boot/syslinux/ChangeLog
+++ b/sys-boot/syslinux/ChangeLog
@@ -1,6 +1,16 @@
# ChangeLog for sys-boot/syslinux
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/ChangeLog,v 1.105 2013/09/23 11:56:54 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/ChangeLog,v 1.106 2013/12/11 13:17:57 chithanh Exp $
+
+*syslinux-6.03_pre1 (11 Dec 2013)
+
+ 11 Dec 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+ +syslinux-6.03_pre1.ebuild, -files/syslinux-4.00-nopie.patch,
+ -files/syslinux-4.05-asneeded-linking-order.patch, -syslinux-2.13.ebuild,
+ -syslinux-4.05.ebuild, -syslinux-4.06.ebuild, -syslinux-5.00.ebuild,
+ -syslinux-5.01.ebuild, -syslinux-6.02_pre15.ebuild,
+ -syslinux-6.02_pre16.ebuild:
+ Bump to latest prerelease. Remove some old versions.
23 Sep 2013; Justin Lecher <jlec@gentoo.org> syslinux-4.07.ebuild,
syslinux-5.00.ebuild, syslinux-5.01.ebuild, syslinux-5.10.ebuild,
diff --git a/sys-boot/syslinux/files/syslinux-4.00-nopie.patch b/sys-boot/syslinux/files/syslinux-4.00-nopie.patch
deleted file mode 100644
index 1db5d1d882fd..000000000000
--- a/sys-boot/syslinux/files/syslinux-4.00-nopie.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur a/com32/MCONFIG b/com32/MCONFIG
---- a/com32/MCONFIG 2010-02-16 23:53:51.000000000 +0100
-+++ b/com32/MCONFIG 2010-02-18 22:28:18.791609195 +0100
-@@ -24,6 +24,8 @@
- GCCOPT += $(call gcc_ok,-freg-struct-return,)
- GCCOPT += -mregparm=3 -DREGPARM=3 -march=i386 -Os
- GCCOPT += $(call gcc_ok,-fPIE,-fPIC)
-+GCCOPT += $(call gcc_ok,-nopie,)
-+GCCOPT += $(call gcc_ok,-fno-pie,)
- GCCOPT += $(call gcc_ok,-fno-exceptions,)
- GCCOPT += $(call gcc_ok,-fno-asynchronous-unwind-tables,)
- GCCOPT += $(call gcc_ok,-fno-strict-aliasing,)
diff --git a/sys-boot/syslinux/files/syslinux-4.05-asneeded-linking-order.patch b/sys-boot/syslinux/files/syslinux-4.05-asneeded-linking-order.patch
deleted file mode 100644
index 8dca7cc42a59..000000000000
--- a/sys-boot/syslinux/files/syslinux-4.05-asneeded-linking-order.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur a/utils/Makefile b/utils/Makefile
---- a/utils/Makefile 2011-12-09 19:28:17.000000000 +0100
-+++ b/utils/Makefile 2011-12-18 20:56:24.306014471 +0100
-@@ -51,7 +51,7 @@
- $(PERL) isohdpfxarray.pl $(ISOHDPFX) > $@
-
- isohybrid: isohybrid.o isohdpfx.o
-- $(CC) $(LDFLAGS) -luuid -o $@ $^
-+ $(CC) $(LDFLAGS) -o $@ $^ -luuid
-
- gethostip: gethostip.o
- $(CC) $(LDFLAGS) -o $@ $^
diff --git a/sys-boot/syslinux/syslinux-2.13.ebuild b/sys-boot/syslinux/syslinux-2.13.ebuild
deleted file mode 100644
index 57178835a668..000000000000
--- a/sys-boot/syslinux/syslinux-2.13.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-2.13.ebuild,v 1.6 2012/06/27 13:31:31 chithanh Exp $
-
-DESCRIPTION="SysLinux, IsoLinux and PXELinux bootloader"
-HOMEPAGE="http://syslinux.zytor.com/"
-SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${PV:0:1}.xx/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-RDEPEND="sys-fs/mtools"
-DEPEND="${RDEPEND}
- dev-lang/nasm"
-
-# This ebuild is a departure from the old way of rebuilding everything in syslinux
-# This departure is necessary since hpa doesn't support the rebuilding of anything other
-# than the installers.
-
-# removed all the unpack/patching stuff since we aren't rebuilding the core stuff anymore
-
-src_compile() {
- emake installer || die
-}
-
-src_install() {
- make INSTALLROOT="${D}" install || die
- dodoc README NEWS TODO *.doc memdisk/memdisk.doc
-}
diff --git a/sys-boot/syslinux/syslinux-4.05.ebuild b/sys-boot/syslinux/syslinux-4.05.ebuild
deleted file mode 100644
index 902e146ae8bf..000000000000
--- a/sys-boot/syslinux/syslinux-4.05.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-4.05.ebuild,v 1.5 2012/05/28 08:47:21 chithanh Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
-HOMEPAGE="http://syslinux.zytor.com/"
-SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${PV:0:1}.xx/${P/_/-}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="custom-cflags"
-
-RDEPEND="sys-fs/mtools
- dev-perl/Crypt-PasswdMD5
- dev-perl/Digest-SHA1"
-DEPEND="${RDEPEND}
- dev-lang/nasm
- <sys-kernel/linux-headers-3.4"
-
-S=${WORKDIR}/${P/_/-}
-
-# This ebuild is a departure from the old way of rebuilding everything in syslinux
-# This departure is necessary since hpa doesn't support the rebuilding of anything other
-# than the installers.
-
-# removed all the unpack/patching stuff since we aren't rebuilding the core stuff anymore
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- # Fix building on hardened
- epatch "${FILESDIR}"/${PN}-4.05-nopie.patch
-
- # Fix building with --as-needed
- epatch "${FILESDIR}"/${PN}-4.05-asneeded-linking-order.patch
-
- rm -f gethostip #bug 137081
-
- # Don't prestrip or override user LDFLAGS, bug #305783
- local SYSLINUX_MAKEFILES="extlinux/Makefile linux/Makefile mtools/Makefile \
- sample/Makefile utils/Makefile"
- sed -i ${SYSLINUX_MAKEFILES} -e '/^LDFLAGS/d' || die "sed failed"
-
- if use custom-cflags; then
- sed -i ${SYSLINUX_MAKEFILES} \
- -e 's|-g -Os||g' \
- -e 's|-Os||g' \
- -e 's|CFLAGS[[:space:]]\+=|CFLAGS +=|g' \
- || die "sed custom-cflags failed"
- fi
-
-}
-
-src_compile() {
- emake CC=$(tc-getCC) installer || die
-}
-
-src_install() {
- emake INSTALLSUBDIRS=utils INSTALLROOT="${D}" MANDIR=/usr/share/man install || die
- dodoc README NEWS doc/*.txt || die
-}
diff --git a/sys-boot/syslinux/syslinux-4.06.ebuild b/sys-boot/syslinux/syslinux-4.06.ebuild
deleted file mode 100644
index 17f4c948da49..000000000000
--- a/sys-boot/syslinux/syslinux-4.06.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-4.06.ebuild,v 1.5 2013/01/11 17:24:42 zerochaos Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
-HOMEPAGE="http://syslinux.zytor.com/"
-SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${PV:0:1}.xx/${P/_/-}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="custom-cflags"
-
-RDEPEND="sys-fs/mtools
- dev-perl/Crypt-PasswdMD5
- dev-perl/Digest-SHA1"
-DEPEND="${RDEPEND}
- dev-lang/nasm
- virtual/os-headers"
-
-S=${WORKDIR}/${P/_/-}
-
-# This ebuild is a departure from the old way of rebuilding everything in syslinux
-# This departure is necessary since hpa doesn't support the rebuilding of anything other
-# than the installers.
-
-# removed all the unpack/patching stuff since we aren't rebuilding the core stuff anymore
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- # Fix building on hardened
- epatch "${FILESDIR}"/${PN}-4.05-nopie.patch
-
- rm -f gethostip #bug 137081
-
- # Don't prestrip or override user LDFLAGS, bug #305783
- local SYSLINUX_MAKEFILES="extlinux/Makefile linux/Makefile mtools/Makefile \
- sample/Makefile utils/Makefile"
- sed -i ${SYSLINUX_MAKEFILES} -e '/^LDFLAGS/d' || die "sed failed"
-
- if use custom-cflags; then
- sed -i ${SYSLINUX_MAKEFILES} \
- -e 's|-g -Os||g' \
- -e 's|-Os||g' \
- -e 's|CFLAGS[[:space:]]\+=|CFLAGS +=|g' \
- || die "sed custom-cflags failed"
- fi
-
-}
-
-src_compile() {
- emake CC=$(tc-getCC) installer || die
-}
-
-src_install() {
- emake INSTALLSUBDIRS=utils INSTALLROOT="${D}" MANDIR=/usr/share/man install || die
- dodoc README NEWS doc/*.txt || die
-}
diff --git a/sys-boot/syslinux/syslinux-5.00.ebuild b/sys-boot/syslinux/syslinux-5.00.ebuild
deleted file mode 100644
index f7ad29d423a1..000000000000
--- a/sys-boot/syslinux/syslinux-5.00.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-5.00.ebuild,v 1.4 2013/09/23 11:56:54 jlec Exp $
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
-HOMEPAGE="http://syslinux.zytor.com/"
-SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${PV:0:1}.xx/${P/_/-}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="custom-cflags"
-
-RDEPEND="sys-fs/mtools
- dev-perl/Crypt-PasswdMD5
- dev-perl/Digest-SHA1"
-DEPEND="${RDEPEND}
- dev-lang/nasm
- virtual/os-headers"
-
-S=${WORKDIR}/${P/_/-}
-
-# This ebuild is a departure from the old way of rebuilding everything in syslinux
-# This departure is necessary since hpa doesn't support the rebuilding of anything other
-# than the installers.
-
-# These are executables which come precompiled and are run by the boot loader
-QA_PREBUILT="usr/share/${PN}/*.c32"
-
-# removed all the unpack/patching stuff since we aren't rebuilding the core stuff anymore
-
-src_prepare() {
- # Fix building on hardened
- epatch "${FILESDIR}"/${PN}-4.05-nopie.patch
-
- rm -f gethostip #bug 137081
-
- # Don't prestrip or override user LDFLAGS, bug #305783
- local SYSLINUX_MAKEFILES="extlinux/Makefile linux/Makefile mtools/Makefile \
- sample/Makefile utils/Makefile"
- sed -i ${SYSLINUX_MAKEFILES} -e '/^LDFLAGS/d' || die "sed failed"
-
- if use custom-cflags; then
- sed -i ${SYSLINUX_MAKEFILES} \
- -e 's|-g -Os||g' \
- -e 's|-Os||g' \
- -e 's|CFLAGS[[:space:]]\+=|CFLAGS +=|g' \
- || die "sed custom-cflags failed"
- else
- QA_FLAGS_IGNORED="
- /sbin/extlinux
- /usr/bin/memdiskfind
- /usr/bin/gethostip
- /usr/bin/isohybrid
- /usr/bin/syslinux
- "
- fi
-
-}
-
-src_compile() {
- emake CC=$(tc-getCC) installer
-}
-
-src_install() {
- emake INSTALLSUBDIRS=utils INSTALLROOT="${D}" MANDIR=/usr/share/man install
- dodoc README NEWS doc/*.txt
-}
diff --git a/sys-boot/syslinux/syslinux-5.01.ebuild b/sys-boot/syslinux/syslinux-5.01.ebuild
deleted file mode 100644
index c20d879e388f..000000000000
--- a/sys-boot/syslinux/syslinux-5.01.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-5.01.ebuild,v 1.3 2013/09/23 11:56:54 jlec Exp $
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
-HOMEPAGE="http://www.syslinux.org/"
-SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${PV:0:1}.xx/${P/_/-}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="custom-cflags"
-
-RDEPEND="sys-fs/mtools
- dev-perl/Crypt-PasswdMD5
- dev-perl/Digest-SHA1"
-DEPEND="${RDEPEND}
- dev-lang/nasm
- virtual/os-headers"
-
-S=${WORKDIR}/${P/_/-}
-
-# This ebuild is a departure from the old way of rebuilding everything in syslinux
-# This departure is necessary since hpa doesn't support the rebuilding of anything other
-# than the installers.
-
-# These are executables which come precompiled and are run by the boot loader
-QA_PREBUILT="usr/share/${PN}/*.c32"
-
-# removed all the unpack/patching stuff since we aren't rebuilding the core stuff anymore
-
-src_prepare() {
- # Fix building on hardened
- epatch "${FILESDIR}"/${PN}-4.05-nopie.patch
-
- rm -f gethostip #bug 137081
-
- # Don't prestrip or override user LDFLAGS, bug #305783
- local SYSLINUX_MAKEFILES="extlinux/Makefile linux/Makefile mtools/Makefile \
- sample/Makefile utils/Makefile"
- sed -i ${SYSLINUX_MAKEFILES} -e '/^LDFLAGS/d' || die "sed failed"
-
- if use custom-cflags; then
- sed -i ${SYSLINUX_MAKEFILES} \
- -e 's|-g -Os||g' \
- -e 's|-Os||g' \
- -e 's|CFLAGS[[:space:]]\+=|CFLAGS +=|g' \
- || die "sed custom-cflags failed"
- else
- QA_FLAGS_IGNORED="
- /sbin/extlinux
- /usr/bin/memdiskfind
- /usr/bin/gethostip
- /usr/bin/isohybrid
- /usr/bin/syslinux
- "
- fi
-
-}
-
-src_compile() {
- emake CC=$(tc-getCC) installer
-}
-
-src_install() {
- emake INSTALLSUBDIRS=utils INSTALLROOT="${D}" MANDIR=/usr/share/man install
- dodoc README NEWS doc/*.txt
-}
diff --git a/sys-boot/syslinux/syslinux-6.02_pre15.ebuild b/sys-boot/syslinux/syslinux-6.02_pre15.ebuild
deleted file mode 100644
index 59ccac9d97b4..000000000000
--- a/sys-boot/syslinux/syslinux-6.02_pre15.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-6.02_pre15.ebuild,v 1.2 2013/09/23 11:56:54 jlec Exp $
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
-HOMEPAGE="http://www.syslinux.org/"
-SRC_URI="mirror://kernel/linux/utils/boot/syslinux/Testing/${PV:0:4}/${P/_/-}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="custom-cflags"
-
-RDEPEND="sys-fs/mtools
- dev-perl/Crypt-PasswdMD5
- dev-perl/Digest-SHA1"
-DEPEND="${RDEPEND}
- dev-lang/nasm
- >=sys-boot/gnu-efi-3.0u
- virtual/os-headers"
-
-S=${WORKDIR}/${P/_/-}
-
-# This ebuild is a departure from the old way of rebuilding everything in syslinux
-# This departure is necessary since hpa doesn't support the rebuilding of anything other
-# than the installers.
-
-# These are executables which come precompiled and are run by the boot loader
-QA_PREBUILT="usr/share/${PN}/*.c32"
-
-# removed all the unpack/patching stuff since we aren't rebuilding the core stuff anymore
-
-src_prepare() {
- rm -f gethostip #bug 137081
-
- # Don't prestrip or override user LDFLAGS, bug #305783
- local SYSLINUX_MAKEFILES="extlinux/Makefile linux/Makefile mtools/Makefile \
- sample/Makefile utils/Makefile"
- sed -i ${SYSLINUX_MAKEFILES} -e '/^LDFLAGS/d' || die "sed failed"
-
- if use custom-cflags; then
- sed -i ${SYSLINUX_MAKEFILES} \
- -e 's|-g -Os||g' \
- -e 's|-Os||g' \
- -e 's|CFLAGS[[:space:]]\+=|CFLAGS +=|g' \
- || die "sed custom-cflags failed"
- else
- QA_FLAGS_IGNORED="
- /sbin/extlinux
- /usr/bin/memdiskfind
- /usr/bin/gethostip
- /usr/bin/isohybrid
- /usr/bin/syslinux
- "
- fi
- case ${ARCH} in
- amd64) loaderarch="efi64" ;;
- x86) loaderarch="efi32" ;;
- *) ewarn "Unsupported architecture, building installers only." ;;
- esac
-}
-
-src_compile() {
- # build system abuses the LDFLAGS variable to pass arguments to ld
- unset LDFLAGS
- if [[ ! -z ${loaderarch} ]]; then
- emake CC=$(tc-getCC) LD=$(tc-getLD) ${loaderarch}
- fi
- emake CC=$(tc-getCC) LD=$(tc-getLD) ${loaderarch} installer
-}
-
-src_install() {
- # parallel install fails sometimes
- einfo "loaderarch=${loaderarch}"
- emake -j1 LD=$(tc-getLD) INSTALLROOT="${D}" MANDIR=/usr/share/man bios ${loaderarch} install
- dodoc README NEWS doc/*.txt
-}
-
-pkg_postinst() {
- # print warning for users upgrading from the previous stable version
- if has 4.06 ${REPLACING_VERSIONS}; then
- ewarn "syslinux now uses dynamically linked ELF executables. Before you reboot,"
- ewarn "ensure that needed dependencies are fulfilled. For example, run from your"
- ewarn "syslinux directory:"
- ewarn
- ewarn "LD_LIBRARY_PATH=\".\" ldd menu.c32"
- fi
-}
diff --git a/sys-boot/syslinux/syslinux-6.02_pre16.ebuild b/sys-boot/syslinux/syslinux-6.03_pre1.ebuild
index 35f47a257320..19ee0f8d7e76 100644
--- a/sys-boot/syslinux/syslinux-6.02_pre16.ebuild
+++ b/sys-boot/syslinux/syslinux-6.03_pre1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-6.02_pre16.ebuild,v 1.2 2013/09/23 11:56:54 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-6.03_pre1.ebuild,v 1.1 2013/12/11 13:17:57 chithanh Exp $
EAPI=4