summaryrefslogtreecommitdiff
path: root/package/syslinux
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-03-30 21:56:07 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-03-30 21:56:07 +0200
commit1a81ab3b835f3b77bb16e47ddb1be9c751e79e0e (patch)
treeb325e977182b293bb8382072f2e4f0a3f88f3089 /package/syslinux
parente56895aca43c2de824228aa3ae00345318a0cb51 (diff)
parent712a7998a6e64638154c2cc3b3262b0881ca0138 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/syslinux')
-rw-r--r--package/syslinux/Makefile35
1 files changed, 21 insertions, 14 deletions
diff --git a/package/syslinux/Makefile b/package/syslinux/Makefile
index b84c0b9ad..00168274b 100644
--- a/package/syslinux/Makefile
+++ b/package/syslinux/Makefile
@@ -4,29 +4,36 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= syslinux
-PKG_VERSION:= 4.03
+PKG_VERSION:= 6.02
PKG_RELEASE:= 1
-PKG_MD5SUM:= 086ac1c569d226a5e2ae3d605de09a1d
+PKG_MD5SUM:= 1df6ff6e4a82b9d7d71a9e7cb5851a5f
PKG_DESCR:= lightweight bootloaders
-PKG_SECTION:= misc
-PKG_BUILDDEP:= nasm
+PKG_SECTION:= boot
+HOST_BUILDDEP:= nasm-host
PKG_URL:= http://syslinux.zytor.com/wiki/index.php/The_Syslinux_Project
PKG_SITES:= http://www.kernel.org/pub/linux/utils/boot/syslinux/
-PKG_ARCH_DEPENDS:= native
-PKG_HOST_DEPENDS:= !darwin !netbsd !openbsd !cygwin !freebsd
+PKG_CFLINE_SYSLINUX:= depends on ADK_HOST_ONLY
+include $(TOPDIR)/mk/host.mk
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,SYSLINUX,syslinux,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call HOST_template,SYSLINUX,syslinux,$(PKG_VERSION)-${PKG_RELEASE}))
-CONFIG_STYLE:= manual
-FAKE_FLAGS+= INSTALLROOT=${WRKINST}
-TARGET_CFLAGS+= -std=c99
+HOST_STYLE:= manual
+HOST_ALL_TARGET:= bios installer
-syslinux-install:
- $(INSTALL_DIR) $(IDIR_SYSLINUX)/usr/bin
- $(INSTALL_BIN) $(WRKINST)/usr/bin/syslinux \
- $(IDIR_SYSLINUX)/usr/bin
+host-build:
+ (cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
+ ${HOST_MAKE_FLAGS} ${HOST_ALL_TARGET})
+syslinux-hostinstall:
+ $(INSTALL_DIR) $(STAGING_HOST_DIR)/usr/bin
+ $(INSTALL_DIR) $(STAGING_HOST_DIR)/usr/share/syslinux
+ $(CP) $(WRKBUILD)/bios/core/isolinux.bin \
+ $(STAGING_HOST_DIR)/usr/share/syslinux
+ $(CP) $(WRKBUILD)/bios/com32/elflink/ldlinux/ldlinux.c32 \
+ $(STAGING_HOST_DIR)/usr/share/syslinux
+
+include ${TOPDIR}/mk/host-bottom.mk
include ${TOPDIR}/mk/pkg-bottom.mk