summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2014-10-14 12:10:05 +0000
committerChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2014-10-14 12:10:05 +0000
commitc6f5d64d7f383928e570ca26a9c35d8e8e3fa07c (patch)
treefa30c58aaf08e76177e6d0d63e4448125ecfc40b /sys-boot/syslinux
parentAdjust upgrade check for current stable version. (diff)
downloadgentoo-2-c6f5d64d7f383928e570ca26a9c35d8e8e3fa07c.tar.gz
gentoo-2-c6f5d64d7f383928e570ca26a9c35d8e8e3fa07c.tar.bz2
gentoo-2-c6f5d64d7f383928e570ca26a9c35d8e8e3fa07c.zip
Drop old prereleases.
(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 0x2324E7B566DF2611!)
Diffstat (limited to 'sys-boot/syslinux')
-rw-r--r--sys-boot/syslinux/ChangeLog7
-rw-r--r--sys-boot/syslinux/files/syslinux-6.03_pre1-add-fno-stack-protector.patch24
-rw-r--r--sys-boot/syslinux/syslinux-6.03_pre1.ebuild93
-rw-r--r--sys-boot/syslinux/syslinux-6.03_pre18.ebuild92
4 files changed, 6 insertions, 210 deletions
diff --git a/sys-boot/syslinux/ChangeLog b/sys-boot/syslinux/ChangeLog
index e8ed9c9f5d64..85c7453b7173 100644
--- a/sys-boot/syslinux/ChangeLog
+++ b/sys-boot/syslinux/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-boot/syslinux
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/ChangeLog,v 1.112 2014/10/14 12:08:35 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/ChangeLog,v 1.113 2014/10/14 12:10:05 chithanh Exp $
+
+ 14 Oct 2014; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+ -files/syslinux-6.03_pre1-add-fno-stack-protector.patch,
+ -syslinux-6.03_pre1.ebuild, -syslinux-6.03_pre18.ebuild:
+ Drop old prereleases.
14 Oct 2014; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
syslinux-5.10.ebuild, syslinux-6.03.ebuild:
diff --git a/sys-boot/syslinux/files/syslinux-6.03_pre1-add-fno-stack-protector.patch b/sys-boot/syslinux/files/syslinux-6.03_pre1-add-fno-stack-protector.patch
deleted file mode 100644
index a44acac80aa5..000000000000
--- a/sys-boot/syslinux/files/syslinux-6.03_pre1-add-fno-stack-protector.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-2014-01-04 Magnus Granberg <zorry@gentoo.org>
-
- # 495146
- * mk/efi.mk: Add -fno-stack-protector
-
---- a/mk/efi.mk 2013-12-11 11:03:38.000000000 +0100
-+++ b/efi.mk 2014-01-04 13:50:11.474255644 +0100
-@@ -7,6 +7,7 @@ core = $(topdir)/core
- # Set up architecture specifics; for cross compilation, set ARCH as apt
- # gnuefi sets up architecture specifics in ia32 or x86_64 sub directories
- # set up the LIBDIR and EFIINC for building for the appropriate architecture
-+GCCOPT := $(call gcc_ok,-fno-stack-protector,)
- EFIINC = $(objdir)/include/efi
- LIBDIR = $(objdir)/lib
-
-@@ -38,7 +39,7 @@ CFLAGS = -I$(EFIINC) -I$(EFIINC)/$(EFI_S
- -DELF_DEBUG -DSYSLINUX_EFI -I$(objdir) \
- $(GCCWARN) -D__COM32__ -mno-red-zone \
- -DLDLINUX=\"$(LDLINUX)\" -fvisibility=hidden \
-- -Wno-unused-parameter
-+ -Wno-unused-parameter $(GCCOPT)
-
- CRT0 := $(LIBDIR)/crt0-efi-$(EFI_SUBARCH).o
- LDSCRIPT := $(LIBDIR)/elf_$(EFI_SUBARCH)_efi.lds
diff --git a/sys-boot/syslinux/syslinux-6.03_pre1.ebuild b/sys-boot/syslinux/syslinux-6.03_pre1.ebuild
deleted file mode 100644
index b628fd9c1f22..000000000000
--- a/sys-boot/syslinux/syslinux-6.03_pre1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-6.03_pre1.ebuild,v 1.2 2014/02/09 18:04:43 zerochaos Exp $
-
-EAPI=5
-
-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() {
- epatch "${FILESDIR}"/${P}-add-fno-stack-protector.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
- 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.03_pre18.ebuild b/sys-boot/syslinux/syslinux-6.03_pre18.ebuild
deleted file mode 100644
index acb7eeb7f578..000000000000
--- a/sys-boot/syslinux/syslinux-6.03_pre18.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-6.03_pre18.ebuild,v 1.1 2014/07/01 15:57:17 chithanh Exp $
-
-EAPI=5
-
-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
-}