jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-27 13:16:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

syslinux: bump version and fix build

Browse Source 
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Thomas Petazzoni 2010-03-16 21:50:16 +01:00
parent 38a88b6918
commit e69ae0bce5
3 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
boot/syslinux/syslinux-3.82-makefile.patch
View File

@ -1,11 +0,0 @@
--- syslinux-3.82-org/Makefile 2009-09-17 13:11:23.000000000 +0200
+++ syslinux-3.82/Makefile 2009-09-17 13:13:32.000000000 +0200
@@ -42,7 +42,7 @@
mbr/mbr_c.bin mbr/altmbr_c.bin mbr/gptmbr_c.bin \
mbr/mbr_f.bin mbr/altmbr_f.bin mbr/gptmbr_f.bin \
core/pxelinux.0 core/isolinux.bin core/isolinux-debug.bin \
- gpxe/gpxelinux.0 dos/syslinux.com win32/syslinux.exe \
+ gpxe/gpxelinux.0 dos/syslinux.com \
$(MODULES)
# BSUBDIRs build the on-target binary components.

17
boot/syslinux/syslinux-3.85-makefile.patch Normal file
View File

@ -0,0 +1,17 @@
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: syslinux-3.85/Makefile
===================================================================
--- syslinux-3.85.orig/Makefile
+++ syslinux-3.85/Makefile
@@ -43,7 +43,7 @@
mbr/mbr_c.bin mbr/altmbr_c.bin mbr/gptmbr_c.bin \
mbr/mbr_f.bin mbr/altmbr_f.bin mbr/gptmbr_f.bin \
core/pxelinux.0 core/isolinux.bin core/isolinux-debug.bin \
- gpxe/gpxelinux.0 dos/syslinux.com win32/syslinux.exe \
+ gpxe/gpxelinux.0 dos/syslinux.com \
dosutil/*.com dosutil/*.sys \
$(MODULES)

30
boot/syslinux/syslinux.mk
View File

@ -22,34 +22,38 @@ ifeq ($(SYSLINUX_SUPPORTED_ARCH),y)
# #
############################################################# #############################################################
SYSLINUX_VERSION:=3.82 SYSLINUX_VERSION:=3.85
SYSLINUX_DIR=$(BUILD_DIR)/syslinux-$(SYSLINUX_VERSION) SYSLINUX_DIR=$(BUILD_DIR)/syslinux-$(SYSLINUX_VERSION)
SYSLINUX_DIR2=$(TOOLCHAIN_DIR)/syslinux-$(SYSLINUX_VERSION)
SYSLINUX_SOURCE=syslinux-$(SYSLINUX_VERSION).tar.bz2 SYSLINUX_SOURCE=syslinux-$(SYSLINUX_VERSION).tar.bz2
SYSLINUX_CAT:=$(BZCAT) SYSLINUX_CAT:=$(BZCAT)
SYSLINUX_SITE=$(BR2_KERNEL_MIRROR)/linux/utils/boot/syslinux/ SYSLINUX_SITE=$(BR2_KERNEL_MIRROR)/linux/utils/boot/syslinux/3.xx/
SYSLINUX_BIN=$(SYSLINUX_DIR2)/mtools/syslinux
$(DL_DIR)/$(SYSLINUX_SOURCE): $(DL_DIR)/$(SYSLINUX_SOURCE):
$(call DOWNLOAD,$(SYSLINUX_SITE),$(SYSLINUX_SOURCE)) $(call DOWNLOAD,$(SYSLINUX_SITE),$(SYSLINUX_SOURCE))
syslinux-source: $(DL_DIR)/$(SYSLINUX_SOURCE) syslinux-source: $(DL_DIR)/$(SYSLINUX_SOURCE)
$(SYSLINUX_DIR)/Makefile: $(DL_DIR)/$(SYSLINUX_SOURCE) $(SYSLINUX_PATCH) $(SYSLINUX_DIR)/.unpacked: $(DL_DIR)/$(SYSLINUX_SOURCE) $(SYSLINUX_PATCH)
$(SYSLINUX_CAT) $(DL_DIR)/$(SYSLINUX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - mkdir -p $(@D)
toolchain/patch-kernel.sh $(SYSLINUX_DIR) boot/syslinux/ \*.patch $(SYSLINUX_CAT) $(DL_DIR)/$(SYSLINUX_SOURCE) | tar $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(@D) boot/syslinux/ \*.patch
touch -c $@ touch -c $@
$(SYSLINUX_DIR)/isolinux.bin $(SYSLINUX_DIR)/pxelinux.bin: $(SYSLINUX_DIR)/Makefile $(SYSLINUX_DIR)/.compiled: $(SYSLINUX_DIR)/.unpacked
$(MAKE) CC="$(HOSTCC)" AR="$(HOSTAR)" -C $(SYSLINUX_DIR) $(TARGET_MAKE_ENV) $(MAKE) CC="$(HOSTCC)" AR="$(HOSTAR)" -C $(SYSLINUX_DIR)
touch -c $@ touch -c $@
syslinux: $(SYSLINUX_DIR)/isolinux.bin $(BINARIES_DIR)/isolinux.bin: $(SYSLINUX_DIR)/.compiled
pxelinux: $(SYSLINUX_DIR)/pxelinux.bin cp -a $(SYSLINUX_DIR)/core/isolinux.bin $@
$(BINARIES_DIR)/pxelinux.bin: $(SYSLINUX_DIR)/.compiled
cp -a $(SYSLINUX_DIR)/core/pxelinux.bin $@
syslinux: $(BINARIES_DIR)/isolinux.bin
pxelinux: $(BINARIES_DIR)/pxelinux.bin
pxelinux-clean syslinux-clean: pxelinux-clean syslinux-clean:
rm -f $(SYSLINUX_DIR)/isolinux.bin $(SYSLINUX_DIR)/pxelinux.bin rm -f $(BINARIES_DIR)/isolinux.bin $(BINARIES_DIR)/pxelinux.bin
-$(MAKE) -C $(SYSLINUX_DIR) clean -$(MAKE) -C $(SYSLINUX_DIR) clean
pxelinux-dirclean syslinux-dirclean: pxelinux-dirclean syslinux-dirclean: