diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-04-18 11:26:02 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-04-19 11:45:17 +0200 |
| commit | b8a95a51b091a65915cdc52f113e7e93e527e231 (patch) | |
| tree | 0008e798c70797cb3631048bed1865a3246ecb5f /patches/syslinux-3.86 | |
| parent | fe835478fef6dd0de4ef3979f9ca4d5f302f9f28 (diff) | |
| download | ptxdist-b8a95a51b091a65915cdc52f113e7e93e527e231.tar.gz ptxdist-b8a95a51b091a65915cdc52f113e7e93e527e231.tar.xz | |
[syslinux] version bump 3.84 -> 3.86
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/syslinux-3.86')
| -rw-r--r-- | patches/syslinux-3.86/0001-Makefile-don-t-fail-during-make-install-on-non-mingw.patch | 34 | ||||
| -rw-r--r-- | patches/syslinux-3.86/series | 1 |
2 files changed, 35 insertions, 0 deletions
diff --git a/patches/syslinux-3.86/0001-Makefile-don-t-fail-during-make-install-on-non-mingw.patch b/patches/syslinux-3.86/0001-Makefile-don-t-fail-during-make-install-on-non-mingw.patch new file mode 100644 index 000000000..1e36c592d --- /dev/null +++ b/patches/syslinux-3.86/0001-Makefile-don-t-fail-during-make-install-on-non-mingw.patch @@ -0,0 +1,34 @@ +From 319a5be6ffaaf19e5e6bb2831edb3ee4763b6875 Mon Sep 17 00:00:00 2001 +From: Marc Kleine-Budde <mkl@pengutronix.de> +Date: Tue, 19 Jan 2010 14:02:01 +0100 +Subject: [PATCH] Makefile: don't fail during make install on non mingw platforms + +"make install" fails on non mingw platform because "win32/syslinux.exe" +isn't build. + +This patch removes "win32/syslinux.exe" from the "INSTALL_AUX" variable. +It's already part of "INSTALL_AUX_OPT" allowing the installation to +fail. + +Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> + +mkl: mailed upstream as: +http://syslinux.zytor.com/archives/2010-January/013669.html + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: b/Makefile +=================================================================== +--- a/Makefile ++++ b/Makefile +@@ -68,7 +68,7 @@ INSTALL_SBIN = extlinux/extlinux + # Things to install in /usr/lib/syslinux + INSTALL_AUX = core/pxelinux.0 gpxe/gpxelinux.0 core/isolinux.bin \ + core/isolinux-debug.bin \ +- dos/syslinux.com win32/syslinux.exe \ ++ dos/syslinux.com \ + mbr/*.bin $(MODULES) + INSTALL_AUX_OPT = win32/syslinux.exe + diff --git a/patches/syslinux-3.86/series b/patches/syslinux-3.86/series new file mode 100644 index 000000000..b813fb86d --- /dev/null +++ b/patches/syslinux-3.86/series @@ -0,0 +1 @@ +0001-Makefile-don-t-fail-during-make-install-on-non-mingw.patch |