libre/grub: rename the patch files to have obvious ordering/purpose

7 files changed, 23 insertions, 42 deletions

diff --git a/libre/grub/0003-10_linux-20_linux_xen-detect-parabola-initramfs.patch b/libre/grub/0002-10_linux-20_linux_xen-detect-parabola-initramfs.patch
index 3ae7d9546..3ae7d9546 100644
--- a/libre/grub/0003-10_linux-20_linux_xen-detect-parabola-initramfs.patch
+++ b/libre/grub/0002-10_linux-20_linux_xen-detect-parabola-initramfs.patch
diff --git a/libre/grub/0003-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch b/libre/grub/1000-am335x_bone--10_linux-20_linux_xen-detect-devicetree-file.patch
index eac637d5b..eac637d5b 100644
--- a/libre/grub/0003-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch
+++ b/libre/grub/1000-am335x_bone--10_linux-20_linux_xen-detect-devicetree-file.patch
diff --git a/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle-devicetree-file.patch b/libre/grub/1000-omap3_beagle--10_linux-20_linux_xen-detect-devicetree-file.patch
index 71d04cb4b..71d04cb4b 100644
--- a/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle-devicetree-file.patch
+++ b/libre/grub/1000-omap3_beagle--10_linux-20_linux_xen-detect-devicetree-file.patch
diff --git a/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm-devicetree-file.patch b/libre/grub/1000-omap3_beagle_xm--10_linux-20_linux_xen-detect-devicetree-file.patch
index 3ba413c05..3ba413c05 100644
--- a/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm-devicetree-file.patch
+++ b/libre/grub/1000-omap3_beagle_xm--10_linux-20_linux_xen-detect-devicetree-file.patch
diff --git a/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm_ab-devicetree-file.patch b/libre/grub/1000-omap3_beagle_xm_ab--10_linux-20_linux_xen-detect-devicetree-file.patch
index f24eed1b6..f24eed1b6 100644
--- a/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm_ab-devicetree-file.patch
+++ b/libre/grub/1000-omap3_beagle_xm_ab--10_linux-20_linux_xen-detect-devicetree-file.patch
diff --git a/libre/grub/0003-10_linux-20_linux_xen-detect-udoo-devicetree-file.patch b/libre/grub/1000-udoo--10_linux-20_linux_xen-detect-devicetree-file.patch
index 692ac51f2..692ac51f2 100644
--- a/libre/grub/0003-10_linux-20_linux_xen-detect-udoo-devicetree-file.patch
+++ b/libre/grub/1000-udoo--10_linux-20_linux_xen-detect-devicetree-file.patch
diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index b3b6deb35..e62d7488c 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -128,29 +128,30 @@ validpgpkeys=('E53D497F3FA42AD8C9B4D1E835A93B74E82E4209'  # Vladimir 'phcoder' S
 source=("git+https://git.savannah.gnu.org/git/grub.git#tag=${_tag}?signed"
         "git+https://git.savannah.gnu.org/git/gnulib.git#commit=${_gnulib_commit}"
         "https://ftp.gnu.org/gnu/unifont/unifont-${_unifont_ver}/unifont-${_unifont_ver}.bdf.gz"{,.sig}
-        '0003-10_linux-20_linux_xen-detect-parabola-initramfs.patch'
         '0001-00_header-add-GRUB_COLOR_-variables.patch'
-        'grub.default'
-        '0003-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch'
-        '0003-10_linux-20_linux_xen-detect-omap3_beagle-devicetree-file.patch'
-        '0003-10_linux-20_linux_xen-detect-omap3_beagle_xm-devicetree-file.patch'
-        '0003-10_linux-20_linux_xen-detect-omap3_beagle_xm_ab-devicetree-file.patch'
-        '0003-10_linux-20_linux_xen-detect-udoo-devicetree-file.patch'
-        '0003-10_linux-20_linux_xen-rebrand-free-distros.patch')
+        '0002-10_linux-20_linux_xen-detect-parabola-initramfs.patch'
+        '0003-10_linux-20_linux_xen-rebrand-free-distros.patch'
+        'grub.default')
+source_armv7h=(
+        '1000-am335x_bone--10_linux-20_linux_xen-detect-devicetree-file.patch'
+        '1000-omap3_beagle--10_linux-20_linux_xen-detect-devicetree-file.patch'
+        '1000-omap3_beagle_xm--10_linux-20_linux_xen-detect-devicetree-file.patch'
+        '1000-omap3_beagle_xm_ab--10_linux-20_linux_xen-detect-devicetree-file.patch'
+        '1000-udoo--10_linux-20_linux_xen-detect-devicetree-file.patch')
 
 sha256sums=('SKIP'
             'SKIP'
             'b7668a5d498972dc4981250c49f83601babce797be19b4fdd0f2f1c6cfbd0fc5'
             'SKIP'
-            'b32a28cb5b97b0bb139c0ee2199b81a2aba124c2ead9b01cfd4485fd2551257f'
             '5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab'
-            'ed6cf7d8efc391b9331322e4502f7469473a8ed05599c36e2b18f167b3cb7879'
-            '0f2e9abaf872e1e18dfe0cd1da42bdc4f49d3956f97a01c39b82c0e3016c1a32'
-            'c0d84384db273d9fd6ea2aab2a9d8ba36402daf8daf591dcba329cfa02253c87'
-            'ef105dcc067c673e543d4d5384aa7bf6b93e9eca96fec4323ab69a91ec079f56'
-            'f5fb1673536d56a88b3d1aaec75501e4d0acca081ac658d1059ec276f9e062c6'
-            'd8911a513166d2db337b9449542e0ad0e91b114f92dc4b876d88d77d23829a1d'
-            '7374137d183957ec8834ce749163c9fa98ff8ee61bbb74b0b38e29daf93857a4')
+            'b32a28cb5b97b0bb139c0ee2199b81a2aba124c2ead9b01cfd4485fd2551257f'
+            '7374137d183957ec8834ce749163c9fa98ff8ee61bbb74b0b38e29daf93857a4'
+            'ed6cf7d8efc391b9331322e4502f7469473a8ed05599c36e2b18f167b3cb7879')
+sha256sums_armv7h=('0f2e9abaf872e1e18dfe0cd1da42bdc4f49d3956f97a01c39b82c0e3016c1a32'
+                   'c0d84384db273d9fd6ea2aab2a9d8ba36402daf8daf591dcba329cfa02253c87'
+                   'ef105dcc067c673e543d4d5384aa7bf6b93e9eca96fec4323ab69a91ec079f56'
+                   'f5fb1673536d56a88b3d1aaec75501e4d0acca081ac658d1059ec276f9e062c6'
+                   'd8911a513166d2db337b9449542e0ad0e91b114f92dc4b876d88d77d23829a1d')
 
 _backports=(
 )
@@ -192,7 +193,7 @@ prepare() {
 	patch -Np1 -i "${srcdir}/0001-00_header-add-GRUB_COLOR_-variables.patch"
 
 	echo "Patch to detect of Parabola GNU/Linux-libre initramfs images by grub-mkconfig..."
-	patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-parabola-initramfs.patch"
+	patch -Np1 -i "${srcdir}/0002-10_linux-20_linux_xen-detect-parabola-initramfs.patch"
 
 	echo "Fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme..."
 	sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "configure.ac"
@@ -716,7 +717,7 @@ package_grub-am335x_bone() {
 	cd "${srcdir}/grub-uboot_am335x-bone/"
 
 	echo 'Patch to detect am335x-bone device tree blob file (dtb)...'
-	patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch"
+	patch -Np1 -i "${srcdir}/1000-am335x_bone--10_linux-20_linux_xen-detect-devicetree-file.patch"
 
 	echo 'Package grub U-Boot stuff...'
 	## _package_grub-uboot
@@ -731,10 +732,6 @@ package_grub-am335x_bone() {
 
 	echo 'Install /etc/default/grub (used by grub-mkconfig)...'
 	install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub"
-
-	## echo 'Patch to detect am335x-bone device tree blob file (dtb)...'
-	## cd "${pkgdir}/etc/grub.d/"
-	## patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch"
 }
 
 package_grub-omap3_beagle() {
@@ -749,7 +746,7 @@ package_grub-omap3_beagle() {
 	cd "${srcdir}/grub-uboot_omap3_beagle/"
 
 	echo 'Patch to detect omap3_beagle device tree blob file (dtb)...'
-	patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-omap3_beagle-devicetree-file.patch"
+	patch -Np1 -i "${srcdir}/1000-omap3_beagle--10_linux-20_linux_xen-detect-devicetree-file.patch"
 
 	echo 'Package grub U-Boot stuff...'
 	## _package_grub-uboot
@@ -764,10 +761,6 @@ package_grub-omap3_beagle() {
 
 	echo 'Install /etc/default/grub (used by grub-mkconfig)...'
 	install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub"
-
-	## echo 'Patch to detect omap3_beagle device tree blob file (dtb)...'
-	## cd "${pkgdir}/etc/grub.d/"
-	## patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-omap3_beagle-devicetree-file.patch"
 }
 
 package_grub-omap3_beagle_xm() {
@@ -782,7 +775,7 @@ package_grub-omap3_beagle_xm() {
 	cd "${srcdir}/grub-uboot_omap3_beagle_xm/"
 
 	echo 'Patch to detect omap3_beagle_xm device tree blob file (dtb)...'
-	patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm-devicetree-file.patch"
+	patch -Np1 -i "${srcdir}/1000-omap3_beagle_xm--10_linux-20_linux_xen-detect-devicetree-file.patch"
 
 	echo 'Package grub U-Boot stuff...'
 	## _package_grub-uboot
@@ -797,10 +790,6 @@ package_grub-omap3_beagle_xm() {
 
 	echo 'Install /etc/default/grub (used by grub-mkconfig)...'
 	install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub"
-
-	## echo 'Patch to detect omap3_beagle_xm device tree blob file (dtb)...'
-	## cd "${pkgdir}/etc/grub.d/"
-	## patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm-devicetree-file.patch"
 }
 
 package_grub-omap3_beagle_xm_ab() {
@@ -815,7 +804,7 @@ package_grub-omap3_beagle_xm_ab() {
 	cd "${srcdir}/grub-uboot_omap3_beagle_xm_ab/"
 
 	echo 'Patch to detect omap3_beagle_xm_ab device tree blob file (dtb)...'
-	patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm_ab-devicetree-file.patch"
+	patch -Np1 -i "${srcdir}/1000-omap3_beagle_xm_ab--10_linux-20_linux_xen-detect-devicetree-file.patch"
 
 	echo 'Package grub U-Boot stuff...'
 	## _package_grub-uboot
@@ -830,10 +819,6 @@ package_grub-omap3_beagle_xm_ab() {
 
 	echo 'Install /etc/default/grub (used by grub-mkconfig)...'
 	install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub"
-
-	## echo 'Patch to detect omap3_beagle_xm_ab device tree blob file (dtb)...'
-	## cd "${pkgdir}/etc/grub.d/"
-	## patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm_ab-devicetree-file.patch"
 }
 
 package_grub-udoo() {
@@ -847,7 +832,7 @@ package_grub-udoo() {
 	cd "${srcdir}/grub-uboot_udoo/"
 
 	echo 'Patch to detect udoo device tree blob file (dtb)...'
-	patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-udoo-devicetree-file.patch"
+	patch -Np1 -i "${srcdir}/1000-udoo--10_linux-20_linux_xen-detect-devicetree-file.patch"
 
 	echo 'Package grub U-Boot stuff...'
 	## _package_grub-uboot
@@ -862,8 +847,4 @@ package_grub-udoo() {
 
 	echo 'Install /etc/default/grub (used by grub-mkconfig)...'
 	install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub"
-
-	## echo 'Patch to detect udoo device tree blob file (dtb)...'
-	## cd "${pkgdir}/etc/grub.d/"
-	## patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-udoo-devicetree-file.patch"
 }