From 15b3e6f901d4cc2ff08c2115512b2d5da47c9969 Mon Sep 17 00:00:00 2001
From: Philipp Felix Hoefler
Date: Fri, 21 Nov 2014 12:49:26 +0100
Subject: [PATCH 1/2] added syslinux:init to INITRAMFS_PARTED_SUPPORT
---
packages/virtual/initramfs/package.mk | 1 +
1 file changed, 1 insertion(+)
diff --git a/packages/virtual/initramfs/package.mk b/packages/virtual/initramfs/package.mk
index 93cfd600028..83317a93a1b 100644
--- a/packages/virtual/initramfs/package.mk
+++ b/packages/virtual/initramfs/package.mk
@@ -40,6 +40,7 @@ if [ "$INITRAMFS_PARTED_SUPPORT" = yes ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET util-linux:init"
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET e2fsprogs:init"
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET parted:init"
+ PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET syslinux:init"
fi
post_install() {
From 7a35d68e9a2661b3008b4dc76eb5dbddc0f62cdc Mon Sep 17 00:00:00 2001
From: Philipp Felix Hoefler
Date: Fri, 21 Nov 2014 12:51:40 +0100
Subject: [PATCH 2/2] added init functionality to syslinux
---
packages/tools/syslinux/package.mk | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/packages/tools/syslinux/package.mk b/packages/tools/syslinux/package.mk
index eae7513fcf7..dff557a9da0 100644
--- a/packages/tools/syslinux/package.mk
+++ b/packages/tools/syslinux/package.mk
@@ -25,6 +25,7 @@ PKG_SITE="http://syslinux.zytor.com/"
PKG_URL="http://www.kernel.org/pub/linux/utils/boot/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS_HOST="util-linux:host"
PKG_DEPENDS_TARGET="toolchain util-linux e2fsprogs syslinux:host"
+PKG_DEPENDS_INIT="toolchain util-linux:init e2fsprogs syslinux"
PKG_PRIORITY="optional"
PKG_SECTION="tools"
PKG_SHORTDESC="syslinux: Linux bootloader collection"
@@ -34,6 +35,7 @@ PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
PKG_MAKE_OPTS_TARGET="CC=$CC AR=$AR RANLIB=$RANLIB installer"
+PKG_MAKE_OPTS_INIT="CC=$CC AR=$AR RANLIB=$RANLIB bios installer"
# Unset all compiler FLAGS
unset CFLAGS
@@ -51,6 +53,12 @@ pre_build_host() {
cp -RP $PKG_BUILD/* $PKG_BUILD/.$HOST_NAME
}
+pre_build_init() {
+ mkdir -p "${PKG_BUILD}/.${TARGET_NAME}-init"
+ cp -RP ${PKG_BUILD}/* "${PKG_BUILD}/.${TARGET_NAME}-init"
+ sed -i "/^LDFLAGS. =/s/$/ -static/" "${PKG_BUILD}/.${TARGET_NAME}-init/extlinux/Makefile"
+}
+
pre_make_target() {
cd .$TARGET_NAME
}
@@ -59,6 +67,10 @@ pre_make_host() {
cd .$HOST_NAME
}
+pre_make_init() {
+ cd ".${TARGET_NAME}-init"
+}
+
make_host() {
make CC=$CC \
AR=$AR \
@@ -97,3 +109,13 @@ makeinstall_target() {
cp efi64/efi/syslinux.efi $INSTALL/usr/share/syslinux/bootx64.efi
cp efi64/com32/elflink/ldlinux/ldlinux.e64 $INSTALL/usr/share/syslinux
}
+
+makeinstall_init() {
+ mkdir -p "${INSTALL}/sbin"
+ cp bios/extlinux/extlinux "${INSTALL}/sbin/."
+
+ $STRIP "${INSTALL}/sbin/extlinux"
+
+ mkdir -p "${INSTALL}/usr/share/syslinux"
+ cp bios/mbr/mbr.bin "${INSTALL}/usr/share/syslinux/."
+}