main/syslinux: fix backported gcc5 patches

- prefix the patches with 'syslinux-'
- make sure that they are actually applied
- add upstream patch for cli cmdline parsing

This should fix the issue where cmdline options are not added to kernel.

1 files changed, 22 insertions, 17 deletions

diff --git a/main/syslinux/APKBUILD b/main/syslinux/APKBUILD
index 8a62e07b9a..276b1674b9 100644
--- a/main/syslinux/APKBUILD
+++ b/main/syslinux/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=syslinux
 pkgver=6.03
-pkgrel=3
+pkgrel=4
 _ver=${pkgver/_/-}
 pkgdesc="Boot loader for the Linux operating system"
 url="http://syslinux.org"
@@ -15,10 +15,11 @@ options="textrels"
 ldpath="/usr/share/syslinux"
 
 source="https://www.kernel.org/pub/linux/utils/boot/syslinux/syslinux-$_ver.tar.xz
-	gcc-fix-alignment.patch::http://repo.or.cz/syslinux.git/patch/e5f2b577ded109291c9632dacb6eaa621d8a59fe?hp=8dc6d758b564a1ccc44c3ae11f265d43628219ce
-	dont-guess-alignment.patch::http://repo.or.cz/syslinux.git/patch/0cc9a99e560a2f52bcf052fd85b1efae35ee812f?hp=e5f2b577ded109291c9632dacb6eaa621d8a59fe
-	btrfs-fix.patch::http://repo.or.cz/syslinux.git/patch/548386049cd41e887079cdb904d3954365eb28f3?hp=721a0af2f0ba111c31685c5f6c5481eb25346971
-	kdb-230.patch::http://repo.or.cz/syslinux.git/patch/138e850fab106b5235178848b3e0d33e25f4d3a2
+	syslinux-gcc-fix-alignment.patch::http://repo.or.cz/syslinux.git/patch/e5f2b577ded109291c9632dacb6eaa621d8a59fe?hp=8dc6d758b564a1ccc44c3ae11f265d43628219ce
+	syslinux-dont-guess-alignment.patch::http://repo.or.cz/syslinux.git/patch/0cc9a99e560a2f52bcf052fd85b1efae35ee812f?hp=e5f2b577ded109291c9632dacb6eaa621d8a59fe
+	syslinux-btrfs-fix.patch::http://repo.or.cz/syslinux.git/patch/548386049cd41e887079cdb904d3954365eb28f3?hp=721a0af2f0ba111c31685c5f6c5481eb25346971
+	syslinux-kdb-230.patch::http://repo.or.cz/syslinux.git/patch/138e850fab106b5235178848b3e0d33e25f4d3a2
+	syslinux-ldlinux-cli.patch::http://repo.or.cz/syslinux.git/patch/8dc6d758b564a1ccc44c3ae11f265d43628219ce
 	update-extlinux.conf
 	update-extlinux
 	"
@@ -34,6 +35,7 @@ builddir="$srcdir"/$pkgname-$_ver
 prepare() {
 	cd "$builddir"
 	for i in $source; do
+		i=${i%%::*}
 		case "$i" in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
 		esac
@@ -59,23 +61,26 @@ package() {
 }
 
 md5sums="92a253df9211e9c20172796ecf388f13  syslinux-6.03.tar.xz
-47a5e4e8fee38ec6c285357853083c4f  gcc-fix-alignment.patch
-bc8e5430bda52b547c7dd89e02960374  dont-guess-alignment.patch
-2fac35a4d11c26b6365bbdc26a1317d3  btrfs-fix.patch
-32e86b5794b7014e7c7feffe8159cf66  kdb-230.patch
+47a5e4e8fee38ec6c285357853083c4f  syslinux-gcc-fix-alignment.patch
+bc8e5430bda52b547c7dd89e02960374  syslinux-dont-guess-alignment.patch
+2fac35a4d11c26b6365bbdc26a1317d3  syslinux-btrfs-fix.patch
+32e86b5794b7014e7c7feffe8159cf66  syslinux-kdb-230.patch
+ee20a36b8925d7abc2d4f3e7c8d4690d  syslinux-ldlinux-cli.patch
 38d206b75b1096ba5df6cfabf455ab06  update-extlinux.conf
 99cb67d6e92c1fc59c6e346c4203abc9  update-extlinux"
 sha256sums="26d3986d2bea109d5dc0e4f8c4822a459276cf021125e8c9f23c3cca5d8c850e  syslinux-6.03.tar.xz
-aeaba8589b99a606cc0adef36bb51916bacb3e5d9abbae38c57398f0e9b4d04c  gcc-fix-alignment.patch
-42a589f9d4b4f20675827dd9e45f300a84f3543978c252f1009c28716e71e359  dont-guess-alignment.patch
-8a730331ba6e31a526666f2d2294c9b19610c91dc82442e51d2efa8338e46de4  btrfs-fix.patch
-527454eb9770f43a292d1b094605a22b260bcba0eedc5fc3631653474f20ce0a  kdb-230.patch
+aeaba8589b99a606cc0adef36bb51916bacb3e5d9abbae38c57398f0e9b4d04c  syslinux-gcc-fix-alignment.patch
+42a589f9d4b4f20675827dd9e45f300a84f3543978c252f1009c28716e71e359  syslinux-dont-guess-alignment.patch
+8a730331ba6e31a526666f2d2294c9b19610c91dc82442e51d2efa8338e46de4  syslinux-btrfs-fix.patch
+527454eb9770f43a292d1b094605a22b260bcba0eedc5fc3631653474f20ce0a  syslinux-kdb-230.patch
+d2e0edd85afe546d585468787b608d2ebea3315d11fc78e173ed494a84a21ad9  syslinux-ldlinux-cli.patch
 d0b7b869489d0ac1529dd742d8d88844ea4e0a5d893de5218b250b97f68e55f2  update-extlinux.conf
 8cc377cc9f244a902087992cd85a88826babf9a0a5096e31bd709bd78a561817  update-extlinux"
 sha512sums="dd2b2916962b9e93bc1e714182e3ca2a727a229b8afabe913050bcfdd43ee2af51ee3acf79121d8c20caf434583efaa7f3196871e0e07c04d82191323a50fe31  syslinux-6.03.tar.xz
-125e6d91d3ceeca2b448540ada6b0ea854462cf47db2f3764e5269554d16a15088f8d4efe10a3026757045ef0e886ba1a7a86182b588ff3df8e8dac22136f697  gcc-fix-alignment.patch
-d92ff124fa2cb5cbc45dba983c954fcab1fb974311f1d2c3d20ea107b8c94f0a22e919573b8bf74c7b6411e5d61fc8befd25debaa8cf7d53a4df3d81cbb16183  dont-guess-alignment.patch
-0033464a94660be59a3dbdf2c3abd0004e9e309aeeaabfb86efe5fa829acc68fc6881c81129ea9b9d7b0b4ebbe2932d8a4931f382cdda6a0015776a6eb68662e  btrfs-fix.patch
-8c83785a4f6d1bd43821dd536d4ff3082911e5bdf12944075bf12120e9123820ebdd17f6dc1bded397d098e4d9850a7fba169419bc3a5c1d792721d747f81ad6  kdb-230.patch
+125e6d91d3ceeca2b448540ada6b0ea854462cf47db2f3764e5269554d16a15088f8d4efe10a3026757045ef0e886ba1a7a86182b588ff3df8e8dac22136f697  syslinux-gcc-fix-alignment.patch
+d92ff124fa2cb5cbc45dba983c954fcab1fb974311f1d2c3d20ea107b8c94f0a22e919573b8bf74c7b6411e5d61fc8befd25debaa8cf7d53a4df3d81cbb16183  syslinux-dont-guess-alignment.patch
+0033464a94660be59a3dbdf2c3abd0004e9e309aeeaabfb86efe5fa829acc68fc6881c81129ea9b9d7b0b4ebbe2932d8a4931f382cdda6a0015776a6eb68662e  syslinux-btrfs-fix.patch
+8c83785a4f6d1bd43821dd536d4ff3082911e5bdf12944075bf12120e9123820ebdd17f6dc1bded397d098e4d9850a7fba169419bc3a5c1d792721d747f81ad6  syslinux-kdb-230.patch
+82e67cc38f84d3b463426163163f0e6f74cf60b6ce8441fedcb719e18a40352b66c10298238169d071f278f222a2010125a1afe7e545ca48f9c85f68ed86fe53  syslinux-ldlinux-cli.patch
 f304068ee174e531890fed20b05d962e6c076160c470ed9cf0d822ff56917793ecabec8c0495b045a740f1f63412a55fbb1fa4b4231b18f76c8584b55f51306d  update-extlinux.conf
 6b90164c5669744d1c3ba379d3d919bd16dfccb87e04ed5dcb6c324617fa0186840b359f5bb2d8515da3b26077b585050812755eb4e0b36e0e646dc7bcf024d2  update-extlinux"