summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
Diffstat (limited to 'libre')
-rw-r--r--libre/grub/0003-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch (renamed from libre/grub/grub-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch)0
-rw-r--r--libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle+-devicetree-file.patch (renamed from libre/grub/grub-10_linux-20_linux_xen-detect-omap3_beagle+-devicetree-file.patch)0
-rw-r--r--libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle-devicetree-file.patch (renamed from libre/grub/grub-10_linux-20_linux_xen-detect-omap3_beagle-devicetree-file.patch)0
-rw-r--r--libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm-devicetree-file.patch (renamed from libre/grub/grub-10_linux-20_linux_xen-detect-omap3_beagle_xm-devicetree-file.patch)0
-rw-r--r--libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm_ab-devicetree-file.patch (renamed from libre/grub/grub-10_linux-20_linux_xen-detect-omap3_beagle_xm_ab-devicetree-file.patch)0
-rw-r--r--libre/grub/0003-10_linux-20_linux_xen-detect-parabola-initramfs.patch (renamed from libre/grub/grub-10_linux-20_linux_xen-detect-parabola-initramfs.patch)0
-rw-r--r--libre/grub/0003-10_linux-20_linux_xen-detect-udoo-devicetree-file.patch (renamed from libre/grub/grub-10_linux-20_linux_xen-detect-udoo-devicetree-file.patch)0
-rw-r--r--libre/grub/0003-10_linux-20_linux_xen-rebrand-free-distros.patch (renamed from libre/grub/grub-10_linux-20_linux_xen-rebrand-free-distros.patch)0
-rw-r--r--libre/grub/0004-add-GRUB_COLOR_variables.patch (renamed from libre/grub/grub-add-GRUB_COLOR_variables.patch)0
-rw-r--r--libre/grub/PKGBUILD61
-rw-r--r--libre/grub/grub-2.00-mkinitcpio-0.15.patch11
-rw-r--r--libre/grub/grub-2.00.5086-fix-lvm-parsing.patch54
-rw-r--r--libre/grub/grub.install21
13 files changed, 32 insertions, 115 deletions
diff --git a/libre/grub/grub-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch b/libre/grub/0003-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch
index b620a39d0..b620a39d0 100644
--- a/libre/grub/grub-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch
+++ b/libre/grub/0003-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch
diff --git a/libre/grub/grub-10_linux-20_linux_xen-detect-omap3_beagle+-devicetree-file.patch b/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle+-devicetree-file.patch
index b620a39d0..b620a39d0 100644
--- a/libre/grub/grub-10_linux-20_linux_xen-detect-omap3_beagle+-devicetree-file.patch
+++ b/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle+-devicetree-file.patch
diff --git a/libre/grub/grub-10_linux-20_linux_xen-detect-omap3_beagle-devicetree-file.patch b/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle-devicetree-file.patch
index 0e5bc382a..0e5bc382a 100644
--- a/libre/grub/grub-10_linux-20_linux_xen-detect-omap3_beagle-devicetree-file.patch
+++ b/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle-devicetree-file.patch
diff --git a/libre/grub/grub-10_linux-20_linux_xen-detect-omap3_beagle_xm-devicetree-file.patch b/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm-devicetree-file.patch
index 387ebbcc5..387ebbcc5 100644
--- a/libre/grub/grub-10_linux-20_linux_xen-detect-omap3_beagle_xm-devicetree-file.patch
+++ b/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm-devicetree-file.patch
diff --git a/libre/grub/grub-10_linux-20_linux_xen-detect-omap3_beagle_xm_ab-devicetree-file.patch b/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm_ab-devicetree-file.patch
index 31b59890e..31b59890e 100644
--- a/libre/grub/grub-10_linux-20_linux_xen-detect-omap3_beagle_xm_ab-devicetree-file.patch
+++ b/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm_ab-devicetree-file.patch
diff --git a/libre/grub/grub-10_linux-20_linux_xen-detect-parabola-initramfs.patch b/libre/grub/0003-10_linux-20_linux_xen-detect-parabola-initramfs.patch
index 8184871b5..8184871b5 100644
--- a/libre/grub/grub-10_linux-20_linux_xen-detect-parabola-initramfs.patch
+++ b/libre/grub/0003-10_linux-20_linux_xen-detect-parabola-initramfs.patch
diff --git a/libre/grub/grub-10_linux-20_linux_xen-detect-udoo-devicetree-file.patch b/libre/grub/0003-10_linux-20_linux_xen-detect-udoo-devicetree-file.patch
index 7cd6be6b4..7cd6be6b4 100644
--- a/libre/grub/grub-10_linux-20_linux_xen-detect-udoo-devicetree-file.patch
+++ b/libre/grub/0003-10_linux-20_linux_xen-detect-udoo-devicetree-file.patch
diff --git a/libre/grub/grub-10_linux-20_linux_xen-rebrand-free-distros.patch b/libre/grub/0003-10_linux-20_linux_xen-rebrand-free-distros.patch
index 47added0d..47added0d 100644
--- a/libre/grub/grub-10_linux-20_linux_xen-rebrand-free-distros.patch
+++ b/libre/grub/0003-10_linux-20_linux_xen-rebrand-free-distros.patch
diff --git a/libre/grub/grub-add-GRUB_COLOR_variables.patch b/libre/grub/0004-add-GRUB_COLOR_variables.patch
index c113a81d5..c113a81d5 100644
--- a/libre/grub/grub-add-GRUB_COLOR_variables.patch
+++ b/libre/grub/0004-add-GRUB_COLOR_variables.patch
diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index 6dbef9f66..8c75d67e6 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -36,12 +36,12 @@ pkgname=('grub')
'grub-omap3_beagle_xm' 'grub-omap3_beagle_xm_ab')
pkgdesc='GNU GRand Unified Bootloader (2), (Parabola rebranded)'
pkgver='2.02.beta3'
-pkgrel='1.parabola2'
+pkgrel='3.parabola1'
epoch='1'
url='https://www.gnu.org/software/grub/'
arch=('x86_64' 'i686' 'armv7h')
license=('GPL3')
-backup=('etc/default/grub' 'etc/grub.d/40_custom')
+backup=('boot/grub/grub.cfg' 'etc/default/grub' 'etc/grub.d/40_custom')
install="${pkgname}.install"
options=('!makeflags')
depends=('sh' 'xz' 'gettext' 'device-mapper')
@@ -74,16 +74,16 @@ source=("grub-${_pkgver}::git+git://git.sv.gnu.org/grub.git#tag=${_GRUB_GIT_TAG}
"http://ftp.gnu.org/gnu/unifont/unifont-${_UNIFONT_VER}/unifont-${_UNIFONT_VER}.bdf.gz"
"http://ftp.gnu.org/gnu/unifont/unifont-${_UNIFONT_VER}/unifont-${_UNIFONT_VER}.bdf.gz.sig"
'0001-Fix-security-issue-when-reading-username-and-passwor.patch'
- 'grub-10_linux-20_linux_xen-detect-parabola-initramfs.patch'
- 'grub-add-GRUB_COLOR_variables.patch'
- '60_memtest86+'
+ '0003-10_linux-20_linux_xen-detect-parabola-initramfs.patch'
+ '0004-add-GRUB_COLOR_variables.patch'
+ '0005-10_linux-fix-grouping-of-tests.patch'
'grub.default'
- 'grub-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch'
- 'grub-10_linux-20_linux_xen-detect-omap3_beagle-devicetree-file.patch'
- 'grub-10_linux-20_linux_xen-detect-omap3_beagle_xm-devicetree-file.patch'
- 'grub-10_linux-20_linux_xen-detect-omap3_beagle_xm_ab-devicetree-file.patch'
- 'grub-10_linux-20_linux_xen-detect-udoo-devicetree-file.patch'
- 'grub-10_linux-20_linux_xen-rebrand-free-distros.patch')
+ '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')
md5sums=('SKIP'
'SKIP'
@@ -92,7 +92,7 @@ md5sums=('SKIP'
'9589ec46a04f9bb4d5da987340a4a324'
'3a9bb9bafe0062388e11f72f0e80ba7e'
'e506ae4a9f9f7d1b765febfa84e10d48'
- 'be55eabc102f2c60b38ed35c203686d6'
+ 'f1999315bbd25b4b9359919ce9b36144'
'8d1dd54ae4a1b550c097e056892ce953'
'a46695e19b588a53b8bac9e3b3c56096'
'803f5b5f56ba6d74ca84aea67659116e'
@@ -111,21 +111,25 @@ _pkgver() {
prepare() {
cd "${srcdir}/grub-${_pkgver}/"
- msg 'CVE-2015-8370'
+ msg 'Patch to fix CVE-2015-8370'
+ # CVE-2015-8370
patch -Np1 -i "${srcdir}/0001-Fix-security-issue-when-reading-username-and-passwor.patch"
msg 'Patch to detect of Parabola GNU/Linux-libre initramfs images by grub-mkconfig'
- patch -Np1 -i "${srcdir}/grub-10_linux-20_linux_xen-detect-parabola-initramfs.patch"
+ patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-parabola-initramfs.patch"
msg 'Patch to enable GRUB_COLOR_* variables in grub-mkconfig'
## Based on http://lists.gnu.org/archive/html/grub-devel/2012-02/msg00021.html
- patch -Np1 -i "${srcdir}/grub-add-GRUB_COLOR_variables.patch"
+ patch -Np1 -i "${srcdir}/0004-add-GRUB_COLOR_variables.patch"
+
+ msg 'Patch to fix grouping of tests for GRUB_DEVICE'
+ patch -Np1 -i "${srcdir}/0005-10_linux-fix-grouping-of-tests.patch"
msg '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 "${srcdir}/grub-${_pkgver}/configure.ac"
msg 'Rebranding for some free distros'
- patch -Np1 -i "${srcdir}/grub-10_linux-20_linux_xen-rebrand-free-distros.patch"
+ patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-rebrand-free-distros.patch"
msg "Fix mkinitcpio 'rw' FS#36275"
sed 's| ro | rw |g' -i "${srcdir}/grub-${_pkgver}/util/grub.d/10_linux.in"
@@ -257,7 +261,7 @@ _build_grub-bios() {
unset MAKEFLAGS
cd "${srcdir}/grub-${_pkgver}-bios"
-
+
msg 'Run autogen.sh for BIOS build'
./autogen.sh
@@ -773,9 +777,6 @@ package_grub() {
msg 'Package grub Multiboot stuff'
_package_grub-multiboot
-
- msg 'Install extra /etc/grub.d/ files'
- install -D -m0755 "${srcdir}/60_memtest86+" "${pkgdir}/etc/grub.d/60_memtest86+"
elif [[ "${CARCH}" = 'armv7h' ]]; then
msg 'Package grub U-Boot stuff'
_package_grub-uboot
@@ -802,7 +803,7 @@ package_grub-am335x_bone() {
cd "${srcdir}/grub-${_pkgver}-uboot_am335x-bone/"
msg 'Patch to detect am335x-bone device tree blob file (dtb)'
- patch -Np1 -i "${srcdir}/grub-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch"
+ patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch"
msg 'Package grub U-Boot stuff'
## _package_grub-uboot
@@ -820,7 +821,7 @@ package_grub-am335x_bone() {
## msg 'Patch to detect am335x-bone device tree blob file (dtb)'
## cd "${pkgdir}/etc/grub.d/"
- ## patch -Np1 -i "${srcdir}/grub-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch"
+ ## patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch"
}
package_grub-omap3_beagle() {
@@ -836,7 +837,7 @@ package_grub-omap3_beagle() {
cd "${srcdir}/grub-${_pkgver}-uboot_omap3_beagle/"
msg 'Patch to detect omap3_beagle device tree blob file (dtb)'
- patch -Np1 -i "${srcdir}/grub-10_linux-20_linux_xen-detect-omap3_beagle-devicetree-file.patch"
+ patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-omap3_beagle-devicetree-file.patch"
msg 'Package grub U-Boot stuff'
## _package_grub-uboot
@@ -854,7 +855,7 @@ package_grub-omap3_beagle() {
## msg 'Patch to detect omap3_beagle device tree blob file (dtb)'
## cd "${pkgdir}/etc/grub.d/"
- ## patch -Np1 -i "${srcdir}/grub-10_linux-20_linux_xen-detect-omap3_beagle-devicetree-file.patch"
+ ## patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-omap3_beagle-devicetree-file.patch"
}
package_grub-omap3_beagle_xm() {
@@ -870,7 +871,7 @@ package_grub-omap3_beagle_xm() {
cd "${srcdir}/grub-${_pkgver}-uboot_omap3_beagle_xm/"
msg 'Patch to detect omap3_beagle_xm device tree blob file (dtb)'
- patch -Np1 -i "${srcdir}/grub-10_linux-20_linux_xen-detect-omap3_beagle_xm-devicetree-file.patch"
+ patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm-devicetree-file.patch"
msg 'Package grub U-Boot stuff'
## _package_grub-uboot
@@ -888,7 +889,7 @@ package_grub-omap3_beagle_xm() {
## msg 'Patch to detect omap3_beagle_xm device tree blob file (dtb)'
## cd "${pkgdir}/etc/grub.d/"
- ## patch -Np1 -i "${srcdir}/grub-10_linux-20_linux_xen-detect-omap3_beagle_xm-devicetree-file.patch"
+ ## patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm-devicetree-file.patch"
}
package_grub-omap3_beagle_xm_ab() {
@@ -904,7 +905,7 @@ package_grub-omap3_beagle_xm_ab() {
cd "${srcdir}/grub-${_pkgver}-uboot_omap3_beagle_xm_ab/"
msg 'Patch to detect omap3_beagle_xm_ab device tree blob file (dtb)'
- patch -Np1 -i "${srcdir}/grub-10_linux-20_linux_xen-detect-omap3_beagle_xm_ab-devicetree-file.patch"
+ patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm_ab-devicetree-file.patch"
msg 'Package grub U-Boot stuff'
## _package_grub-uboot
@@ -922,7 +923,7 @@ package_grub-omap3_beagle_xm_ab() {
## msg 'Patch to detect omap3_beagle_xm_ab device tree blob file (dtb)'
## cd "${pkgdir}/etc/grub.d/"
- ## patch -Np1 -i "${srcdir}/grub-10_linux-20_linux_xen-detect-omap3_beagle_xm_ab-devicetree-file.patch"
+ ## patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm_ab-devicetree-file.patch"
}
package_grub-udoo() {
@@ -937,7 +938,7 @@ package_grub-udoo() {
cd "${srcdir}/grub-${_pkgver}-uboot_udoo/"
msg 'Patch to detect udoo device tree blob file (dtb)'
- patch -Np1 -i "${srcdir}/grub-10_linux-20_linux_xen-detect-udoo-devicetree-file.patch"
+ patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-udoo-devicetree-file.patch"
msg 'Package grub U-Boot stuff'
## _package_grub-uboot
@@ -955,5 +956,5 @@ package_grub-udoo() {
## msg 'Patch to detect udoo device tree blob file (dtb)'
## cd "${pkgdir}/etc/grub.d/"
- ## patch -Np1 -i "${srcdir}/grub-10_linux-20_linux_xen-detect-udoo-devicetree-file.patch"
+ ## patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-udoo-devicetree-file.patch"
}
diff --git a/libre/grub/grub-2.00-mkinitcpio-0.15.patch b/libre/grub/grub-2.00-mkinitcpio-0.15.patch
deleted file mode 100644
index 1af848fa3..000000000
--- a/libre/grub/grub-2.00-mkinitcpio-0.15.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- util/grub.d/10_linux.in.old 2013-07-28 08:55:47.825946239 +0200
-+++ util/grub.d/10_linux.in 2013-07-28 08:56:14.082201512 +0200
-@@ -138,7 +138,7 @@
- message="$(gettext_printf "Loading Linux %s ..." "${version}")"
- sed "s/^/$submenu_indentation/" << EOF
- echo '$(echo "$message" | grub_quote)'
-- linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
-+ linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} rw ${args}
- EOF
- if test -n "${initrd}" ; then
- # TRANSLATORS: ramdisk isn't identifier. Should be translated.
diff --git a/libre/grub/grub-2.00.5086-fix-lvm-parsing.patch b/libre/grub/grub-2.00.5086-fix-lvm-parsing.patch
deleted file mode 100644
index 9a2eb3ff7..000000000
--- a/libre/grub/grub-2.00.5086-fix-lvm-parsing.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-There is no explicit option to turn off alignment; it is implicitly
-disabled if one of --separator or --nameprefixes option is used.
-
---separator was added in 2007, --nameprefixes - in 2009. So let's use
---separator to extend range of versions we are compatible with. Note that
-one or another must be used, current parsing is broken otherwise.
-
-Signed-off-by: Andrey Borzenkov <address@hidden>
-
----
- util/getroot.c | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/util/getroot.c b/util/getroot.c
-index 2ad8a55..3afcf96 100644
---- a/util/getroot.c
-+++ b/util/getroot.c
-@@ -1322,7 +1322,7 @@ grub_util_get_dev_abstraction (const char *os_dev)
- static void
- pull_lvm_by_command (const char *os_dev)
- {
-- char *argv[6];
-+ char *argv[8];
- int fd;
- pid_t pid;
- FILE *mdadm;
-@@ -1351,12 +1351,17 @@ pull_lvm_by_command (const char *os_dev)
-
- /* execvp has inconvenient types, hence the casts. None of these
- strings will actually be modified. */
-+ /* by default PV name is left aligned in 10 character field, meaning that
-+ we do not know where name ends. Using dummy --separator disables
-+ alignment. We have a single field, so separator itself is not output */
- argv[0] = (char *) "vgs";
- argv[1] = (char *) "--options";
- argv[2] = (char *) "pv_name";
- argv[3] = (char *) "--noheadings";
-- argv[4] = vgname;
-- argv[5] = NULL;
-+ argv[4] = (char *) "--separator";
-+ argv[5] = (char *) ":";
-+ argv[6] = vgname;
-+ argv[7] = NULL;
-
- pid = exec_pipe (argv, &fd);
- free (vgname);
-@@ -1376,6 +1381,7 @@ pull_lvm_by_command (const char *os_dev)
- while (getline (&buf, &len, mdadm) > 0)
- {
- char *ptr;
-+ /* LVM adds two spaces as standard prefix */
- for (ptr = buf; ptr < buf + 2 && *ptr == ' '; ptr++);
- if (*ptr == '\0')
- continue;
diff --git a/libre/grub/grub.install b/libre/grub/grub.install
index 9188b357a..af67b89ce 100644
--- a/libre/grub/grub.install
+++ b/libre/grub/grub.install
@@ -1,6 +1,3 @@
-infodir="usr/share/info"
-filelist=('grub.info' 'grub-dev.info')
-
post_install() {
if [ -f /boot/grub/grub.cfg.pacsave ]; then
echo "Copying /boot/grub/grub.cfg.pacsave to /boot/grub/grub.cfg"
@@ -11,23 +8,7 @@ post_install() {
Generating grub.cfg.example config file...
This may fail on some machines running a custom kernel.
EOM
-
+
grub-mkconfig -o /boot/grub/grub.cfg.example 2> /dev/null
echo "done."
-
- for file in ${filelist[@]}; do
- install-info ${infodir}/${file}.gz ${infodir}/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- for file in ${filelist[@]}; do
- install-info ${infodir}/${file}.gz ${infodir}/dir 2> /dev/null
- done
-}
-
-pre_remove() {
- for file in ${filelist[@]}; do
- install-info --delete ${infodir}/${file} ${infodir}/dir 2> /dev/null
- done
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-01 07:34:12 +0000