[arch-commits] Commit in grub/trunk (PKGBUILD)
Date: Monday, May 11, 2020 @ 18:46:26
Author: eworm
Revision: 383230
update unifont
Modified:
grub/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-05-11 18:41:48 UTC (rev 383229)
+++ PKGBUILD2020-05-11 18:46:26 UTC (rev 383230)
@@ -11,7 +11,7 @@
_GRUB_EXTRAS_COMMIT="8a245d5c1800627af4cefa99162a89c7a46d8842"
_GNULIB_COMMIT="be584c56eb1311606e5ea1a36363b97bddb6eed3"
-_UNIFONT_VER="12.1.03"
+_UNIFONT_VER="13.0.02"
[[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64"
[[ "${CARCH}" == "i686" ]] && _EFI_ARCH="i386"
@@ -70,7 +70,7 @@
sha256sums=('SKIP'
'SKIP'
'SKIP'
-'6067bda8daa1f3c49d8876107992e19fc9ab905ad54c01c3131b9649977c3746'
+'ee02036aec9350dc35ebaaa205c43f9f9ad14efc56d63c12b177ac4fd424e94f'
'SKIP'
'171415ab075d1ac806f36c454feeb060f870416f24279b70104bba94bd6076d4'
'a5198267ceb04dceb6d2ea7800281a42b3f91fd02da55d2cc9ea20d47273ca29'
[arch-commits] Commit in grub/trunk (PKGBUILD)
Date: Wednesday, May 6, 2020 @ 11:21:55
Author: allan
Revision: 382381
upgpkg: grub 2:2.04-6: rebuild for reproducibility - somehow translation files
were missing in old package
Modified:
grub/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-05-06 10:57:21 UTC (rev 382380)
+++ PKGBUILD2020-05-06 11:21:55 UTC (rev 382381)
@@ -23,7 +23,7 @@
pkgdesc='GNU GRand Unified Bootloader (2)'
_pkgver=2.04
pkgver=${_pkgver/-/}
-pkgrel=5
+pkgrel=6
epoch=2
url='https://www.gnu.org/software/grub/'
arch=('x86_64')
[arch-commits] Commit in grub/trunk (PKGBUILD)
Date: Thursday, January 2, 2020 @ 10:17:47
Author: eworm
Revision: 372467
reenable all translations
Modified:
grub/trunk/PKGBUILD
--+
PKGBUILD |3 ---
1 file changed, 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-01-02 08:26:46 UTC (rev 372466)
+++ PKGBUILD2020-01-02 10:17:47 UTC (rev 372467)
@@ -132,9 +132,6 @@
echo "Pull in latest language files..."
./linguas.sh
- echo "Remove not working langs which need LC_ALL=C.UTF-8..."
- sed -e 's#en@cyrillic en@greek##g' -i "po/LINGUAS"
-
echo "Avoid problem with unifont during compile of grub..."
# http://savannah.gnu.org/bugs/?40330 and
https://bugs.archlinux.org/task/37847
gzip -cd "${srcdir}/unifont-${_UNIFONT_VER}.bdf.gz" > "unifont.bdf"
[arch-commits] Commit in grub/trunk (PKGBUILD)
Date: Monday, December 30, 2019 @ 23:04:47
Author: eworm
Revision: 372395
upgpkg: grub 2:2.04-5
make the build reproducible (second try...)
Modified:
grub/trunk/PKGBUILD
--+
PKGBUILD |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-12-30 18:34:57 UTC (rev 372394)
+++ PKGBUILD2019-12-30 23:04:47 UTC (rev 372395)
@@ -23,7 +23,7 @@
pkgdesc='GNU GRand Unified Bootloader (2)'
_pkgver=2.04
pkgver=${_pkgver/-/}
-pkgrel=4
+pkgrel=5
epoch=2
url='https://www.gnu.org/software/grub/'
arch=('x86_64')
@@ -143,6 +143,9 @@
./bootstrap \
--gnulib-srcdir="${srcdir}/gnulib/" \
--no-git
+
+ echo "Make translations reproducible..."
+ sed -i '1i /^PO-Revision-Date:/ d' po/*.sed
}
_build_grub-common_and_bios() {
@@ -179,7 +182,7 @@
"${_configure_options[@]}"
if [ ! -z "${SOURCE_DATE_EPOCH}" ]; then
- echo "Make the build reproducible..."
+ echo "Make info pages reproducible..."
touch -d "@${SOURCE_DATE_EPOCH}" $(find -name '*.texi')
fi
[arch-commits] Commit in grub/trunk (PKGBUILD)
Date: Wednesday, December 25, 2019 @ 22:05:17
Author: eworm
Revision: 372260
upgpkg: grub 2:2.04-4
* update bundled code
* make the build reproducible (hopefully...)
Modified:
grub/trunk/PKGBUILD
--+
PKGBUILD | 15 ++-
1 file changed, 10 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-12-25 21:07:22 UTC (rev 372259)
+++ PKGBUILD2019-12-25 22:05:17 UTC (rev 372260)
@@ -9,9 +9,9 @@
## "1" to enable EMU build, "0" to disable
_GRUB_EMU_BUILD="0"
-_GRUB_EXTRAS_COMMIT="136763a4cc9ca3a4f59d05b79eede2159d6f441e"
-_GNULIB_COMMIT="9ce9be2ef0cb1180e35dfe9dfbbe90d774b374bd"
-_UNIFONT_VER="12.1.02"
+_GRUB_EXTRAS_COMMIT="8a245d5c1800627af4cefa99162a89c7a46d8842"
+_GNULIB_COMMIT="be584c56eb1311606e5ea1a36363b97bddb6eed3"
+_UNIFONT_VER="12.1.03"
[[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64"
[[ "${CARCH}" == "i686" ]] && _EFI_ARCH="i386"
@@ -23,7 +23,7 @@
pkgdesc='GNU GRand Unified Bootloader (2)'
_pkgver=2.04
pkgver=${_pkgver/-/}
-pkgrel=3
+pkgrel=4
epoch=2
url='https://www.gnu.org/software/grub/'
arch=('x86_64')
@@ -69,7 +69,7 @@
sha256sums=('SKIP'
'SKIP'
'SKIP'
-'04d652be1e28a6d464965c75c71ac84633085cd0960c2687466651c34c94bd89'
+'6067bda8daa1f3c49d8876107992e19fc9ab905ad54c01c3131b9649977c3746'
'SKIP'
'171415ab075d1ac806f36c454feeb060f870416f24279b70104bba94bd6076d4'
'a5198267ceb04dceb6d2ea7800281a42b3f91fd02da55d2cc9ea20d47273ca29'
@@ -178,6 +178,11 @@
--enable-boot-time \
"${_configure_options[@]}"
+ if [ ! -z "${SOURCE_DATE_EPOCH}" ]; then
+ echo "Make the build reproducible..."
+ touch -d "@${SOURCE_DATE_EPOCH}" $(find -name '*.texi')
+ fi
+
echo "Run make for bios build..."
make
}
[arch-commits] Commit in grub/trunk (PKGBUILD grub.default)
Date: Tuesday, November 5, 2019 @ 09:28:39
Author: eworm
Revision: 366791
upgpkg: grub 2:2.04-3
* do not depend on which (FS#64155)
* improve wording (FS#64070)
Modified:
grub/trunk/PKGBUILD
grub/trunk/grub.default
--+
PKGBUILD |4 ++--
grub.default |4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-11-05 09:03:29 UTC (rev 366790)
+++ PKGBUILD2019-11-05 09:28:39 UTC (rev 366791)
@@ -23,7 +23,7 @@
pkgdesc='GNU GRand Unified Bootloader (2)'
_pkgver=2.04
pkgver=${_pkgver/-/}
-pkgrel=2
+pkgrel=3
epoch=2
url='https://www.gnu.org/software/grub/'
arch=('x86_64')
@@ -73,7 +73,7 @@
'SKIP'
'171415ab075d1ac806f36c454feeb060f870416f24279b70104bba94bd6076d4'
'a5198267ceb04dceb6d2ea7800281a42b3f91fd02da55d2cc9ea20d47273ca29'
-'b8fe532668cb12c34d2a26221298f2459fac7c5578a14476a2af8c20aed5c101')
+'690adb7943ee9fedff578a9d482233925ca3ad3e5a50fffddd27cf33300a89e3')
_backports=(
# grub-mkconfig: Use portable "command -v" to detect installed programs
Modified: grub.default
===
--- grub.default2019-11-05 09:03:29 UTC (rev 366790)
+++ grub.default2019-11-05 09:28:39 UTC (rev 366791)
@@ -49,6 +49,6 @@
# Uncomment to get a beep at GRUB start
#GRUB_INIT_TUNE="480 440 1"
-# Uncomment to make GRUB remember the last selection. This requires to
-# set 'GRUB_DEFAULT=saved' above.
+# Uncomment to make GRUB remember the last selection. This requires
+# setting 'GRUB_DEFAULT=saved' above.
#GRUB_SAVEDEFAULT="true"
[arch-commits] Commit in grub/trunk (PKGBUILD)
Date: Monday, October 28, 2019 @ 18:44:08 Author: eworm Revision: 365977 do not depend on which FS#64155 Modified: grub/trunk/PKGBUILD --+ PKGBUILD |2 ++ 1 file changed, 2 insertions(+) Modified: PKGBUILD === --- PKGBUILD2019-10-28 14:13:08 UTC (rev 365976) +++ PKGBUILD2019-10-28 18:44:08 UTC (rev 365977) @@ -76,6 +76,8 @@ 'b8fe532668cb12c34d2a26221298f2459fac7c5578a14476a2af8c20aed5c101') _backports=( + # grub-mkconfig: Use portable "command -v" to detect installed programs + '28a7e597de0d5584f65e36f9588ff9041936e617' ) _configure_options=(
[arch-commits] Commit in grub/trunk (PKGBUILD)
Date: Wednesday, July 31, 2019 @ 09:22:14
Author: eworm
Revision: 358812
upgpkg: grub 2:2.04-2
rebuilt with latest changes
Modified:
grub/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-07-31 09:11:49 UTC (rev 358811)
+++ PKGBUILD2019-07-31 09:22:14 UTC (rev 358812)
@@ -23,7 +23,7 @@
pkgdesc='GNU GRand Unified Bootloader (2)'
_pkgver=2.04
pkgver=${_pkgver/-/}
-pkgrel=1
+pkgrel=2
epoch=2
url='https://www.gnu.org/software/grub/'
arch=('x86_64')
[arch-commits] Commit in grub/trunk (PKGBUILD grub.default)
Date: Thursday, July 11, 2019 @ 14:51:53 Author: eworm Revision: 357752 revert change that disables audit Modified: grub/trunk/PKGBUILD grub/trunk/grub.default --+ PKGBUILD |2 +- grub.default |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-07-11 13:04:34 UTC (rev 357751) +++ PKGBUILD2019-07-11 14:51:53 UTC (rev 357752) @@ -73,7 +73,7 @@ 'SKIP' '171415ab075d1ac806f36c454feeb060f870416f24279b70104bba94bd6076d4' 'a5198267ceb04dceb6d2ea7800281a42b3f91fd02da55d2cc9ea20d47273ca29' -'fd2e5f5453f3e44a2cb640c796b85cd70da8359c703f94cd531d457ede8c77fa') +'b8fe532668cb12c34d2a26221298f2459fac7c5578a14476a2af8c20aed5c101') _backports=( ) Modified: grub.default === --- grub.default2019-07-11 13:04:34 UTC (rev 357751) +++ grub.default2019-07-11 14:51:53 UTC (rev 357752) @@ -3,7 +3,7 @@ GRUB_DEFAULT=0 GRUB_TIMEOUT=5 GRUB_DISTRIBUTOR="Arch" -GRUB_CMDLINE_LINUX_DEFAULT="audit=0 loglevel=3 quiet" +GRUB_CMDLINE_LINUX_DEFAULT="loglevel=3 quiet" GRUB_CMDLINE_LINUX="" # Preload both GPT and MBR modules so that they are not missed
[arch-commits] Commit in grub/trunk (PKGBUILD)
Date: Friday, July 5, 2019 @ 10:28:03
Author: eworm
Revision: 357316
upgpkg: grub 2:2.04-1
new upstream release
Modified:
grub/trunk/PKGBUILD
--+
PKGBUILD | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-07-04 23:12:28 UTC (rev 357315)
+++ PKGBUILD2019-07-05 10:28:03 UTC (rev 357316)
@@ -9,9 +9,9 @@
## "1" to enable EMU build, "0" to disable
_GRUB_EMU_BUILD="0"
-_GRUB_EXTRAS_COMMIT="f2a079441939eee7251bf141986cdd78946e1d20"
-_GNULIB_COMMIT="3f14b27dec6f4a590d8ae0ffcbb7cf7714815a05"
-_UNIFONT_VER="12.0.01"
+_GRUB_EXTRAS_COMMIT="136763a4cc9ca3a4f59d05b79eede2159d6f441e"
+_GNULIB_COMMIT="9ce9be2ef0cb1180e35dfe9dfbbe90d774b374bd"
+_UNIFONT_VER="12.1.02"
[[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64"
[[ "${CARCH}" == "i686" ]] && _EFI_ARCH="i386"
@@ -21,7 +21,7 @@
pkgname='grub'
pkgdesc='GNU GRand Unified Bootloader (2)'
-_pkgver=2.04-rc1
+_pkgver=2.04
pkgver=${_pkgver/-/}
pkgrel=1
epoch=2
@@ -55,6 +55,7 @@
fi
validpgpkeys=('E53D497F3FA42AD8C9B4D1E835A93B74E82E4209' # Vladimir 'phcoder'
Serbinenko
+ 'BE5C23209ACDDACEB20DB0A28C8189F1988C2166' # Daniel Kiper
'95D2E9AB8740D8046387FD151A09227B1F435A33') # Paul Hardy
source=("git+https://git.savannah.gnu.org/git/grub.git#tag=grub-${_pkgver}?signed";
@@ -68,7 +69,7 @@
sha256sums=('SKIP'
'SKIP'
'SKIP'
-'f48450d3ca0ae0ca9f1c6e81cf1af60e5b0dfa87cc3a72520ce2ef15d54de6dd'
+'04d652be1e28a6d464965c75c71ac84633085cd0960c2687466651c34c94bd89'
'SKIP'
'171415ab075d1ac806f36c454feeb060f870416f24279b70104bba94bd6076d4'
'a5198267ceb04dceb6d2ea7800281a42b3f91fd02da55d2cc9ea20d47273ca29'
@@ -134,7 +135,7 @@
echo "Avoid problem with unifont during compile of grub..."
# http://savannah.gnu.org/bugs/?40330 and
https://bugs.archlinux.org/task/37847
- cp "${srcdir}/unifont-${_UNIFONT_VER}.bdf" "unifont.bdf"
+ gzip -cd "${srcdir}/unifont-${_UNIFONT_VER}.bdf.gz" > "unifont.bdf"
echo "Run bootstrap..."
./bootstrap \
[arch-commits] Commit in grub/trunk (PKGBUILD)
Date: Friday, April 5, 2019 @ 11:04:19
Author: eworm
Revision: 349854
update unifont
Modified:
grub/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-04-05 10:54:30 UTC (rev 349853)
+++ PKGBUILD2019-04-05 11:04:19 UTC (rev 349854)
@@ -11,7 +11,7 @@
_GRUB_EXTRAS_COMMIT="f2a079441939eee7251bf141986cdd78946e1d20"
-_UNIFONT_VER="11.0.02"
+_UNIFONT_VER="12.0.01"
[[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64"
[[ "${CARCH}" == "i686" ]] && _EFI_ARCH="i386"
@@ -72,7 +72,7 @@
sha256sums=('810b3798d316394f94096ec2797909dbf23c858e48f7b3830826b8daa06b7b0f'
'SKIP'
'2844601914cea6b1231eca0104853a93c4d67a5209933a0766f1475953300646'
-'a7ea9ca4f6dcb59377d978194835ede669457069256184f86d46ab5b863c56e6'
+'f48450d3ca0ae0ca9f1c6e81cf1af60e5b0dfa87cc3a72520ce2ef15d54de6dd'
'SKIP'
'b41e4438319136b5e74e0abdfcb64ae115393e4e15207490272c425f54026dd3'
'a5198267ceb04dceb6d2ea7800281a42b3f91fd02da55d2cc9ea20d47273ca29'
[arch-commits] Commit in grub/trunk (PKGBUILD grub.default)
Date: Wednesday, March 6, 2019 @ 07:55:46 Author: eworm Revision: 347130 replace deprecated option with GRUB_TIMEOUT_STYLE Modified: grub/trunk/PKGBUILD grub/trunk/grub.default --+ PKGBUILD |2 +- grub.default |6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-03-06 07:48:09 UTC (rev 347129) +++ PKGBUILD2019-03-06 07:55:46 UTC (rev 347130) @@ -82,7 +82,7 @@ 'e84b8de569c7e6b73263758c35cf95c6516fde85d4ed451991427864f6a4e5a8' 'fcd5a626d4af33665d041ce42df813f1f198d8230ea186481b155a5b676f3b87' '51562fa1016c54567dbf42a86c0cfc902372ab579bbee17879a81aff09b76b99' -'74e5dd2090a153c10a7b9599b73bb09e70fddc6a019dd41641b0f10b9d773d82') +'9ca2414266fadd0b1aafc850c1c26a48760fbc95f1913ab8b36f1e54483b31fd') _configure_options=( FREETYPE="pkg-config freetype2" Modified: grub.default === --- grub.default2019-03-06 07:48:09 UTC (rev 347129) +++ grub.default2019-03-06 07:55:46 UTC (rev 347130) @@ -12,9 +12,9 @@ # Uncomment to enable booting from LUKS encrypted devices #GRUB_ENABLE_CRYPTODISK=y -# Uncomment to enable Hidden Menu, and optionally hide the timeout count -#GRUB_HIDDEN_TIMEOUT=5 -#GRUB_HIDDEN_TIMEOUT_QUIET=true +# Set to 'countdown' or 'hidden' to change timeout behavior, +# press ESC key to display menu. +GRUB_TIMEOUT_STYLE=menu # Uncomment to use basic console GRUB_TERMINAL_INPUT=console
[arch-commits] Commit in grub/trunk (PKGBUILD grub.cfg grub.install)
Date: Friday, November 23, 2018 @ 21:08:42
Author: eworm
Revision: 340356
upgpkg: grub 2:2.02-8
* update unifont
* stop packaging useless boot configuration
* minor cleanups
Modified:
grub/trunk/PKGBUILD
grub/trunk/grub.install
Deleted:
grub/trunk/grub.cfg
--+
PKGBUILD | 24 +++--
grub.cfg | 139 -
grub.install | 20
3 files changed, 20 insertions(+), 163 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-11-23 20:51:08 UTC (rev 340355)
+++ PKGBUILD2018-11-23 21:08:42 UTC (rev 340356)
@@ -11,7 +11,7 @@
_GRUB_EXTRAS_COMMIT="f2a079441939eee7251bf141986cdd78946e1d20"
-_UNIFONT_VER="10.0.06"
+_UNIFONT_VER="11.0.02"
[[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64"
[[ "${CARCH}" == "i686" ]] && _EFI_ARCH="i386"
@@ -19,16 +19,15 @@
[[ "${CARCH}" == "x86_64" ]] && _EMU_ARCH="x86_64"
[[ "${CARCH}" == "i686" ]] && _EMU_ARCH="i386"
-pkgname="grub"
-pkgdesc="GNU GRand Unified Bootloader (2)"
+pkgname='grub'
+pkgdesc='GNU GRand Unified Bootloader (2)'
pkgver=2.02
-pkgrel=7
+pkgrel=8
epoch=2
-url="https://www.gnu.org/software/grub/";
+url='https://www.gnu.org/software/grub/'
arch=('x86_64')
license=('GPL3')
-backup=('boot/grub/grub.cfg'
-'etc/default/grub'
+backup=('etc/default/grub'
'etc/grub.d/40_custom')
install="${pkgname}.install"
options=('!makeflags')
@@ -68,13 +67,12 @@
'0008-Fix-packed-not-aligned-error-on-GCC-8.patch'
'0009-xfs-Accept-filesystem-with-sparse-inodes.patch'
'0010-relocation.patch'
-'grub.default'
-'grub.cfg')
+'grub.default')
sha256sums=('810b3798d316394f94096ec2797909dbf23c858e48f7b3830826b8daa06b7b0f'
'SKIP'
'2844601914cea6b1231eca0104853a93c4d67a5209933a0766f1475953300646'
-'0d81571fc519573057b7641d26a31ead55cc0b02a931589fb346a3a534c3dcc1'
+'a7ea9ca4f6dcb59377d978194835ede669457069256184f86d46ab5b863c56e6'
'SKIP'
'b41e4438319136b5e74e0abdfcb64ae115393e4e15207490272c425f54026dd3'
'a5198267ceb04dceb6d2ea7800281a42b3f91fd02da55d2cc9ea20d47273ca29'
@@ -84,8 +82,7 @@
'e84b8de569c7e6b73263758c35cf95c6516fde85d4ed451991427864f6a4e5a8'
'fcd5a626d4af33665d041ce42df813f1f198d8230ea186481b155a5b676f3b87'
'51562fa1016c54567dbf42a86c0cfc902372ab579bbee17879a81aff09b76b99'
-'74e5dd2090a153c10a7b9599b73bb09e70fddc6a019dd41641b0f10b9d773d82'
-'c5e4f3836130c6885e9273c21f057263eba53f4b7c0e2f111f6e5f2e487a47ad')
+'74e5dd2090a153c10a7b9599b73bb09e70fddc6a019dd41641b0f10b9d773d82')
_configure_options=(
FREETYPE="pkg-config freetype2"
@@ -280,9 +277,6 @@
echo "Install /etc/default/grub (used by grub-mkconfig)..."
install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub"
-
- echo "Install grub.cfg for backup array..."
- install -D -m0644 "${srcdir}/grub.cfg" "${pkgdir}/boot/grub/grub.cfg"
}
_package_grub-efi() {
Deleted: grub.cfg
===
--- grub.cfg2018-11-23 20:51:08 UTC (rev 340355)
+++ grub.cfg2018-11-23 21:08:42 UTC (rev 340356)
@@ -1,139 +0,0 @@
-#
-# DO NOT EDIT THIS FILE
-#
-# It is automatically generated by grub-mkconfig using templates
-# from /etc/grub.d and settings from /etc/default/grub
-#
-
-### BEGIN /etc/grub.d/00_header ###
-insmod part_gpt
-insmod part_msdos
-if [ -s $prefix/grubenv ]; then
- load_env
-fi
-set default="0"
-
-if [ x"${feature_menuentry_id}" = xy ]; then
- menuentry_id_option="--id"
-else
- menuentry_id_option=""
-fi
-
-export menuentry_id_option
-
-if [ "${prev_saved_entry}" ]; then
- set saved_entry="${prev_saved_entry}"
- save_env saved_entry
- set prev_saved_entry=
- save_env prev_saved_entry
- set boot_once=true
-fi
-
-function savedefault {
- if [ -z "${boot_once}" ]; then
-saved_entry="${chosen}"
-save_env saved_entry
- fi
-}
-
-function load_video {
- if [ x$feature_all_video_module = xy ]; then
-insmod all_video
- else
-insmod efi_gop
-insmod efi_uga
-insmod ieee1275_fb
-insmod vbe
-insmod vga
-insmod video_bochs
-insmod video_cirrus
- fi
-}
-
-if [ x$feature_default_font_path = xy ] ; then
- font=unicode
-else
-insmod part_msdos
-insmod ext2
-set root='hd0,msdos5'
-if [ x$feature_platform_search_hint = xy ]; then
- search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos5
--hint-efi=hd0,msdos5 --hint-baremetal=ahci0,msdos5
ad4103fa-d940-47ca-8506-301d8071d467
-else
- search --no-floppy --fs-uuid --set=root ad4103fa-d940-47ca-8506-301d8071d467
-fi
-font="/usr/share/grub/unicode.pf2"
-fi
-
-if loadfont $font ; then
- set gfxmode=auto
- load_video
- insmod gfxterm
- set locale_dir=$prefix/locale
- set lang=en_US
- insmod gettex
[arch-commits] Commit in grub/trunk (PKGBUILD)
Date: Wednesday, October 17, 2018 @ 08:53:52
Author: eworm
Revision: 336798
replace msg with echo
Modified:
grub/trunk/PKGBUILD
--+
PKGBUILD | 90 ++---
1 file changed, 45 insertions(+), 45 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-10-17 07:43:54 UTC (rev 336797)
+++ PKGBUILD2018-10-17 08:53:52 UTC (rev 336798)
@@ -113,56 +113,56 @@
prepare() {
cd "${srcdir}/grub-${pkgver}/"
- msg "Patch to detect of Arch Linux initramfs images by grub-mkconfig"
+ echo "Patch to detect of Arch Linux initramfs images by
grub-mkconfig..."
patch -Np1 -i "${srcdir}/0003-10_linux-detect-archlinux-initramfs.patch"
- msg "Patch to enable GRUB_COLOR_* variables in grub-mkconfig"
+ echo "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}/0004-add-GRUB_COLOR_variables.patch"
- msg "Patch to allow GRUB to mount ext2/3/4 filesystems that have the
encryption feature"
+ echo "Patch to allow GRUB to mount ext2/3/4 filesystems that have the
encryption feature..."
patch -Np1 -i
"${srcdir}/0005-Allow_GRUB_to_mount_ext234_filesystems_that_have_the_encryption_feature.patch"
- msg "Patch to change default tsc calibration method to pmtimer on EFI
systems"
+ echo "Patch to change default tsc calibration method to pmtimer on EFI
systems..."
patch -Np1 -i
"${srcdir}/0006-tsc-Change-default-tsc-calibration-method-to-pmtimer-on-EFI-systems.patch"
- msg "Patch to Support multiple early initrd images"
+ echo "Patch to Support multiple early initrd images..."
patch -Np1 -i
"${srcdir}/0007-grub-mkconfig_10_linux_Support_multiple_early_initrd_images.patch"
- msg "Patch to fix packed-not-aligned error on GCC 8"
+ echo "Patch to fix packed-not-aligned error on GCC 8..."
patch -Np1 -i
"${srcdir}/0008-Fix-packed-not-aligned-error-on-GCC-8.patch"
- msg "Patch xfs: Accept filesystem with sparse inodes"
+ echo "Patch xfs: Accept filesystem with sparse inodes..."
patch -Np1 -i
"${srcdir}/0009-xfs-Accept-filesystem-with-sparse-inodes.patch"
- msg "Patch x86-64: Treat R_X86_64_PLT32 as R_X86_64_PC32"
+ echo "Patch x86-64: Treat R_X86_64_PLT32 as R_X86_64_PC32..."
patch -Np1 -i "${srcdir}/0010-relocation.patch"
- msg "Fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2
files for starfield theme"
+ 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"
- msg "Fix mkinitcpio 'rw' FS#36275"
+ echo "Fix mkinitcpio 'rw' FS#36275..."
sed 's| ro | rw |g' -i "util/grub.d/10_linux.in"
- msg "Fix OS naming FS#33393"
+ echo "Fix OS naming FS#33393..."
sed 's|GNU/Linux|Linux|' -i "util/grub.d/10_linux.in"
- msg "Pull in latest language files"
+ echo "Pull in latest language files..."
./linguas.sh
- msg "Remove not working langs which need LC_ALL=C.UTF-8"
+ echo "Remove not working langs which need LC_ALL=C.UTF-8..."
sed -e 's#en@cyrillic en@greek##g' -i "po/LINGUAS"
- msg "Avoid problem with unifont during compile of grub"
+ echo "Avoid problem with unifont during compile of grub..."
# http://savannah.gnu.org/bugs/?40330 and
https://bugs.archlinux.org/task/37847
cp "${srcdir}/unifont-${_UNIFONT_VER}.bdf" "unifont.bdf"
- msg "Run autogen.sh"
+ echo "Run autogen.sh..."
./autogen.sh
}
_build_grub-common_and_bios() {
- msg "Set ARCH dependent variables for bios build"
+ echo "Set ARCH dependent variables for bios build..."
if [[ "${CARCH}" == 'x86_64' ]]; then
_EFIEMU="--enable-efiemu"
else
@@ -169,17 +169,17 @@
_EFIEMU="--disable-efiemu"
fi
- msg "Copy the source for building the bios part"
+ echo "Copy the source for building the bios part..."
cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-${pkgver}-bios"
cd "${srcdir}/grub-${pkgver}-bios/"
- msg "Add the grub-extra sources for bios build"
+ echo "Add the grub-extra sources for bios build..."
install -d "${srcdir}/grub-${pkgver}-bios/grub-extras"
cp -r "${srcdir}/grub-extras-${_GRUB_EXTRAS_COMMIT}/915resolution" \
"${srcdir}/grub-${pkgver}-bios/grub-extras/915resolution"
export GRUB_CONTRIB="${srcdir}/grub-${pkgver}-bios/grub-extras/"
- msg "Unset all compiler FLAGS for bios build"
+ echo "Unset all compiler FLAGS for bios build..."
unset CFLAGS
unset
[arch-commits] Commit in grub/trunk (PKGBUILD)
Date: Sunday, June 24, 2018 @ 22:35:42
Author: eworm
Revision: 327535
upgpkg: grub 2:2.02-7
* fix unifont with recent freetype2
* put common configure options in an array variable
* general cleanups
Modified:
grub/trunk/PKGBUILD
--+
PKGBUILD | 124 +++--
1 file changed, 32 insertions(+), 92 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-06-24 22:33:21 UTC (rev 327534)
+++ PKGBUILD2018-06-24 22:35:42 UTC (rev 327535)
@@ -22,7 +22,7 @@
pkgname="grub"
pkgdesc="GNU GRand Unified Bootloader (2)"
pkgver=2.02
-pkgrel=6
+pkgrel=7
epoch=2
url="https://www.gnu.org/software/grub/";
arch=('x86_64')
@@ -84,6 +84,29 @@
'fcd5a626d4af33665d041ce42df813f1f198d8230ea186481b155a5b676f3b87'
'74e5dd2090a153c10a7b9599b73bb09e70fddc6a019dd41641b0f10b9d773d82'
'c5e4f3836130c6885e9273c21f057263eba53f4b7c0e2f111f6e5f2e487a47ad')
+
+_configure_options=(
+ FREETYPE="pkg-config freetype2"
+ BUILD_FREETYPE="pkg-config freetype2"
+ --enable-mm-debug
+ --enable-nls
+ --enable-device-mapper
+ --enable-cache-stats
+ --enable-grub-mkfont
+ --enable-grub-mount
+ --prefix="/usr"
+ --bindir="/usr/bin"
+ --sbindir="/usr/bin"
+ --mandir="/usr/share/man"
+ --infodir="/usr/share/info"
+ --datarootdir="/usr/share"
+ --sysconfdir="/etc"
+ --program-prefix=""
+ --with-bootdir="/boot"
+ --with-grubdir="grub"
+ --disable-silent-rules
+ --disable-werror
+)
prepare() {
cd "${srcdir}/grub-${pkgver}/"
@@ -90,25 +113,21 @@
msg "Patch to detect of Arch Linux initramfs images by grub-mkconfig"
patch -Np1 -i "${srcdir}/0003-10_linux-detect-archlinux-initramfs.patch"
- echo
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}/0004-add-GRUB_COLOR_variables.patch"
- echo
msg "Patch to allow GRUB to mount ext2/3/4 filesystems that have the
encryption feature"
patch -Np1 -i
"${srcdir}/0005-Allow_GRUB_to_mount_ext234_filesystems_that_have_the_encryption_feature.patch"
- echo
msg "Patch to change default tsc calibration method to pmtimer on EFI
systems"
patch -Np1 -i
"${srcdir}/0006-tsc-Change-default-tsc-calibration-method-to-pmtimer-on-EFI-systems.patch"
- echo
- msg "Support multiple early initrd images"
+ msg "Patch to Support multiple early initrd images"
patch -Np1 -i
"${srcdir}/0007-grub-mkconfig_10_linux_Support_multiple_early_initrd_images.patch"
- msg "Fix packed-not-aligned error on GCC 8"
+ msg "Patch to fix packed-not-aligned error on GCC 8"
patch -Np1 -i
"${srcdir}/0008-Fix-packed-not-aligned-error-on-GCC-8.patch"
msg "xfs: Accept filesystem with sparse inodes"
@@ -125,7 +144,6 @@
msg "Pull in latest language files"
./linguas.sh
- echo
msg "Remove not working langs which need LC_ALL=C.UTF-8"
sed -e 's#en@cyrillic en@greek##g' -i "po/LINGUAS"
@@ -133,6 +151,9 @@
msg "Avoid problem with unifont during compile of grub"
# http://savannah.gnu.org/bugs/?40330 and
https://bugs.archlinux.org/task/37847
cp "${srcdir}/unifont-${_UNIFONT_VER}.bdf" "unifont.bdf"
+
+ msg "Run autogen.sh"
+ ./autogen.sh
}
_build_grub-common_and_bios() {
@@ -160,40 +181,16 @@
unset LDFLAGS
unset MAKEFLAGS
- msg "Run autogen.sh for bios build"
- ./autogen.sh
- echo
-
msg "Run ./configure for bios build"
./configure \
- FREETYPE="pkg-config freetype2" \
--with-platform="pc" \
--target="i386" \
"${_EFIEMU}" \
- --enable-mm-debug \
- --enable-nls \
- --enable-device-mapper \
- --enable-cache-stats \
--enable-boot-time \
- --enable-grub-mkfont \
- --enable-grub-mount \
- --prefix="/usr" \
- --bindir="/usr/bin" \
- --sbindir="/usr/bin" \
- --mandir="/usr/share/man" \
- --infodir="/usr/share/info" \
- --datarootdir="/usr/share" \
- --sysconfdir="/etc" \
- --program-prefix="" \
- --with-bootdir="/boot" \
- --with-grubdir="grub" \
- --disable-silent-rules \
- --disable-werror
- echo
+ "${_configure_options[@]}"
msg "Run make for bios build"
make
- echo
}
_build_grub-efi() {
@@ -208,40 +205,16 @@
unset LDFLAGS
unset MAKEFLAGS
- msg "Run autogen.sh
[arch-commits] Commit in grub/trunk (PKGBUILD)
Date: Monday, May 7, 2018 @ 22:16:03
Author: eworm
Revision: 323463
fix build with freetype2 >= 2.9.1-1
Modified:
grub/trunk/PKGBUILD
--+
PKGBUILD |1 +
1 file changed, 1 insertion(+)
Modified: PKGBUILD
===
--- PKGBUILD2018-05-07 22:02:20 UTC (rev 323462)
+++ PKGBUILD2018-05-07 22:16:03 UTC (rev 323463)
@@ -156,6 +156,7 @@
msg "Run ./configure for bios build"
./configure \
+ FREETYPE="pkg-config freetype2" \
--with-platform="pc" \
--target="i386" \
"${_EFIEMU}" \
[arch-commits] Commit in grub/trunk (PKGBUILD)
Date: Saturday, September 16, 2017 @ 23:19:12
Author: eworm
Revision: 305698
upgpkg: grub 2:2.02-3
update unifont to version 10.0.06
Modified:
grub/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-09-16 23:13:34 UTC (rev 305697)
+++ PKGBUILD2017-09-16 23:19:12 UTC (rev 305698)
@@ -11,7 +11,7 @@
_GRUB_EXTRAS_COMMIT="f2a079441939eee7251bf141986cdd78946e1d20"
-_UNIFONT_VER="9.0.06"
+_UNIFONT_VER="10.0.06"
[[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64"
[[ "${CARCH}" == "i686" ]] && _EFI_ARCH="i386"
@@ -22,7 +22,7 @@
pkgname="grub"
pkgdesc="GNU GRand Unified Bootloader (2)"
pkgver=2.02
-pkgrel=2
+pkgrel=3
epoch=2
url="https://www.gnu.org/software/grub/";
arch=('x86_64' 'i686')
@@ -70,7 +70,7 @@
sha256sums=('810b3798d316394f94096ec2797909dbf23c858e48f7b3830826b8daa06b7b0f'
'SKIP'
'2844601914cea6b1231eca0104853a93c4d67a5209933a0766f1475953300646'
-'4246c4773ed70f78a7e27ff1118fd257a280d1102200265ad5d58bb2011195ef'
+'0d81571fc519573057b7641d26a31ead55cc0b02a931589fb346a3a534c3dcc1'
'SKIP'
'37adb95049f6cdcbdbf60ed6b6440c5be99a4cd307a0f96c3c3837b6c2e07f3c'
'b41e4438319136b5e74e0abdfcb64ae115393e4e15207490272c425f54026dd3'
[arch-commits] Commit in grub/trunk (PKGBUILD grub.default)
Date: Wednesday, September 13, 2017 @ 21:26:46
Author: eworm
Revision: 305449
update checksum for configuration file changes
Modified:
grub/trunk/PKGBUILD
grub/trunk/grub.default
--+
PKGBUILD |2 +-
grub.default |6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-09-13 21:19:17 UTC (rev 305448)
+++ PKGBUILD2017-09-13 21:26:46 UTC (rev 305449)
@@ -76,7 +76,7 @@
'b41e4438319136b5e74e0abdfcb64ae115393e4e15207490272c425f54026dd3'
'a5198267ceb04dceb6d2ea7800281a42b3f91fd02da55d2cc9ea20d47273ca29'
'535422c510a050d41efe7720dbe54de29e04bdb8f86fd5aea5feb0b24f7abe46'
-'df764fbd876947dea973017f95371e53833bf878458140b09f0b70d900235676'
+'74e5dd2090a153c10a7b9599b73bb09e70fddc6a019dd41641b0f10b9d773d82'
'c5e4f3836130c6885e9273c21f057263eba53f4b7c0e2f111f6e5f2e487a47ad')
prepare() {
Modified: grub.default
===
--- grub.default2017-09-13 21:19:17 UTC (rev 305448)
+++ grub.default2017-09-13 21:26:46 UTC (rev 305449)
@@ -30,14 +30,14 @@
# Uncomment to allow the kernel use the same resolution used by grub
GRUB_GFXPAYLOAD_LINUX=keep
-# Uncomment if you want GRUB to pass to the Linux kernel the old parameter
-# format "root=/dev/xxx" instead of "root=/dev/disk/by-uuid/xxx"
+# Uncomment if you want GRUB to pass to the Linux kernel the old parameter
+# format "root=/dev/xxx" instead of "root=/dev/disk/by-uuid/xxx"
#GRUB_DISABLE_LINUX_UUID=true
# Uncomment to disable generation of recovery mode menu entries
GRUB_DISABLE_RECOVERY=true
-# Uncomment and set to the desired menu colors. Used by normal and wallpaper
+# Uncomment and set to the desired menu colors. Used by normal and wallpaper
# modes only. Entries specified as foreground/background.
#GRUB_COLOR_NORMAL="light-blue/black"
#GRUB_COLOR_HIGHLIGHT="light-cyan/blue"
[arch-commits] Commit in grub/trunk (PKGBUILD)
Date: Tuesday, June 13, 2017 @ 14:12:42
Author: eworm
Revision: 298729
update source to use git snapshot and https
Modified:
grub/trunk/PKGBUILD
--+
PKGBUILD | 12 +++-
1 file changed, 7 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-06-13 13:11:57 UTC (rev 298728)
+++ PKGBUILD2017-06-13 14:12:42 UTC (rev 298729)
@@ -57,8 +57,8 @@
validpgpkeys=('E53D497F3FA42AD8C9B4D1E835A93B74E82E4209' # Vladimir 'phcoder'
Serbinenko
'95D2E9AB8740D8046387FD151A09227B1F435A33') # Paul Hardy
-source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig}
-
"grub-extras::git+git://git.sv.gnu.org/grub-extras.git#commit=${_GRUB_EXTRAS_COMMIT}"
+source=("https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig}
+
"https://git.savannah.nongnu.org/cgit/grub-extras.git/snapshot/grub-extras-${_GRUB_EXTRAS_COMMIT}.tar.gz";
"https://ftp.gnu.org/gnu/unifont/unifont-${_UNIFONT_VER}/unifont-${_UNIFONT_VER}.bdf.gz"{,.sig}
'0002-intel-ucode.patch'
'0003-10_linux-detect-archlinux-initramfs.patch'
@@ -68,7 +68,7 @@
sha256sums=('810b3798d316394f94096ec2797909dbf23c858e48f7b3830826b8daa06b7b0f'
'SKIP'
-'SKIP'
+'2844601914cea6b1231eca0104853a93c4d67a5209933a0766f1475953300646'
'4246c4773ed70f78a7e27ff1118fd257a280d1102200265ad5d58bb2011195ef'
'SKIP'
'37adb95049f6cdcbdbf60ed6b6440c5be99a4cd307a0f96c3c3837b6c2e07f3c'
@@ -109,7 +109,8 @@
msg "Remove not working langs which need LC_ALL=C.UTF-8"
sed -e 's#en@cyrillic en@greek##g' -i "po/LINGUAS"
- msg "Avoid problem with unifont during compile of grub,
http://savannah.gnu.org/bugs/?40330 and https://bugs.archlinux.org/task/37847";
+ msg "Avoid problem with unifont during compile of grub"
+ # http://savannah.gnu.org/bugs/?40330 and
https://bugs.archlinux.org/task/37847
cp "${srcdir}/unifont-${_UNIFONT_VER}.bdf" "unifont.bdf"
}
@@ -127,7 +128,8 @@
msg "Add the grub-extra sources for bios build"
install -d "${srcdir}/grub-${pkgver}-bios/grub-extras"
- cp -r "${srcdir}/grub-extras/915resolution"
"${srcdir}/grub-${pkgver}-bios/grub-extras/915resolution"
+ cp -r "${srcdir}/grub-extras-${_GRUB_EXTRAS_COMMIT}/915resolution" \
+ "${srcdir}/grub-${pkgver}-bios/grub-extras/915resolution"
export GRUB_CONTRIB="${srcdir}/grub-${pkgver}-bios/grub-extras/"
msg "Unset all compiler FLAGS for bios build"
[arch-commits] Commit in grub/trunk (PKGBUILD)
Date: Wednesday, April 26, 2017 @ 20:06:45
Author: eworm
Revision: 294837
upgpkg: grub 2:2.02-1
new upstream release
Modified:
grub/trunk/PKGBUILD
--+
PKGBUILD | 77 ++---
1 file changed, 33 insertions(+), 44 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-04-26 19:36:43 UTC (rev 294836)
+++ PKGBUILD2017-04-26 20:06:45 UTC (rev 294837)
@@ -1,5 +1,6 @@
-# Maintainer : Tobias Powalowski
+# Maintainer : Christian Hesse
# Maintainer : Ronald van Haren
+# Contributor: Tobias Powalowski
# Contributor: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt)
(gemmaeiil) (ddoott) (ccoomm)>
## "1" to enable IA32-EFI build in Arch x86_64, "0" to disable
@@ -8,8 +9,6 @@
## "1" to enable EMU build, "0" to disable
_GRUB_EMU_BUILD="0"
-_pkgver="2.02"
-_GRUB_GIT_TAG="2.02-rc2"
_GRUB_EXTRAS_COMMIT="f2a079441939eee7251bf141986cdd78946e1d20"
_UNIFONT_VER="9.0.06"
@@ -22,13 +21,15 @@
pkgname="grub"
pkgdesc="GNU GRand Unified Bootloader (2)"
-pkgver=2.02.rc2
+pkgver=2.02
pkgrel=1
-epoch=1
+epoch=2
url="https://www.gnu.org/software/grub/";
arch=('x86_64' 'i686')
license=('GPL3')
-backup=('boot/grub/grub.cfg' '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')
@@ -53,12 +54,12 @@
'sdl: For grub-emu SDL support')
fi
-validpgpkeys=('95D2E9AB8740D8046387FD151A09227B1F435A33') # Paul Hardy
+validpgpkeys=('E53D497F3FA42AD8C9B4D1E835A93B74E82E4209' # Vladimir 'phcoder'
Serbinenko
+ '95D2E9AB8740D8046387FD151A09227B1F435A33') # Paul Hardy
-source=("grub-${_pkgver}::git+git://git.sv.gnu.org/grub.git#tag=${_GRUB_GIT_TAG}"
+source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig}
"grub-extras::git+git://git.sv.gnu.org/grub-extras.git#commit=${_GRUB_EXTRAS_COMMIT}"
-
"https://ftp.gnu.org/gnu/unifont/unifont-${_UNIFONT_VER}/unifont-${_UNIFONT_VER}.bdf.gz";
-
"https://ftp.gnu.org/gnu/unifont/unifont-${_UNIFONT_VER}/unifont-${_UNIFONT_VER}.bdf.gz.sig";
+
"https://ftp.gnu.org/gnu/unifont/unifont-${_UNIFONT_VER}/unifont-${_UNIFONT_VER}.bdf.gz"{,.sig}
'0002-intel-ucode.patch'
'0003-10_linux-detect-archlinux-initramfs.patch'
'0004-add-GRUB_COLOR_variables.patch'
@@ -65,8 +66,9 @@
'grub.default'
'grub.cfg')
-sha256sums=('SKIP'
+sha256sums=('810b3798d316394f94096ec2797909dbf23c858e48f7b3830826b8daa06b7b0f'
'SKIP'
+'SKIP'
'4246c4773ed70f78a7e27ff1118fd257a280d1102200265ad5d58bb2011195ef'
'SKIP'
'37adb95049f6cdcbdbf60ed6b6440c5be99a4cd307a0f96c3c3837b6c2e07f3c'
@@ -75,13 +77,8 @@
'df764fbd876947dea973017f95371e53833bf878458140b09f0b70d900235676'
'c5e4f3836130c6885e9273c21f057263eba53f4b7c0e2f111f6e5f2e487a47ad')
-_pkgver() {
- cd "${srcdir}/grub-${_pkgver}/"
- echo "$(git describe --tags)" | sed -e 's|grub.||g' -e 's|-|\.|g'
-}
-
prepare() {
- cd "${srcdir}/grub-${_pkgver}/"
+ cd "${srcdir}/grub-${pkgver}/"
msg "Patch to load Intel microcode"
patch -Np1 -i "${srcdir}/0002-intel-ucode.patch"
@@ -97,26 +94,23 @@
echo
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"
+ sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu
/usr/share/fonts/TTF|g' -i "configure.ac"
msg "Fix mkinitcpio 'rw' FS#36275"
- sed 's| ro | rw |g' -i
"${srcdir}/grub-${_pkgver}/util/grub.d/10_linux.in"
+ sed 's| ro | rw |g' -i "util/grub.d/10_linux.in"
msg "Fix OS naming FS#33393"
- sed 's|GNU/Linux|Linux|' -i
"${srcdir}/grub-${_pkgver}/util/grub.d/10_linux.in"
+ sed 's|GNU/Linux|Linux|' -i "util/grub.d/10_linux.in"
- # msg "autogen.sh requires python (2/3). since bzr is in makedepends,
use python2 and no need to pull python3"
- # sed 's|python |python2 |g' -i "${srcdir}/grub-${_pkgver}/autogen.sh"
-
msg "Pull in latest language files"
./linguas.sh
echo
msg "Remove not working langs which need LC_ALL=C.UTF-8"
- sed -e 's#en@cyrillic en@greek##g' -i
"${srcdir}/grub-${_pkgver}/po/LINGUAS"
+ sed -e 's#en@cyrillic en@greek##g' -i "po/LINGUAS"
msg "Avoid problem with unifont during compile of grub,
http://savannah.gnu.org/bugs/?40330 and https://bugs.archlinux.org/task/37847";
- cp "${srcdir}/unifont-${_UNIFONT_VER}.bdf"
"${srcdir}/grub-${_pkgver}/unifont.bdf"
+ cp "${srcdir}/unifont-${_UNIFONT_VER}.bdf" "unifont.bdf"
}
_build_grub-common_and_bios() {
@@ -128,
[arch-commits] Commit in grub/trunk (PKGBUILD)
Date: Thursday, March 16, 2017 @ 21:33:30 Author: eworm Revision: 290962 upgpkg: grub 1:2.02.rc2-1 new upstream release Modified: grub/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-03-16 21:23:09 UTC (rev 290961) +++ PKGBUILD2017-03-16 21:33:30 UTC (rev 290962) @@ -9,7 +9,7 @@ _GRUB_EMU_BUILD="0" _pkgver="2.02" -_GRUB_GIT_TAG="2.02-rc1" +_GRUB_GIT_TAG="2.02-rc2" _GRUB_EXTRAS_COMMIT="f2a079441939eee7251bf141986cdd78946e1d20" _UNIFONT_VER="9.0.06" @@ -22,7 +22,7 @@ pkgname="grub" pkgdesc="GNU GRand Unified Bootloader (2)" -pkgver=2.02.rc1 +pkgver=2.02.rc2 pkgrel=1 epoch=1 url="https://www.gnu.org/software/grub/";
[arch-commits] Commit in grub/trunk (PKGBUILD)
Date: Monday, January 9, 2017 @ 11:59:40
Author: eworm
Revision: 285564
upgpkg: grub 1:2.02.beta3-6
update to unifont 9.0.06
Modified:
grub/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-01-09 11:36:05 UTC (rev 285563)
+++ PKGBUILD2017-01-09 11:59:40 UTC (rev 285564)
@@ -12,7 +12,7 @@
_GRUB_GIT_TAG="grub-2.02-beta3"
_GRUB_EXTRAS_COMMIT="f2a079441939eee7251bf141986cdd78946e1d20"
-_UNIFONT_VER="6.3.20131217"
+_UNIFONT_VER="9.0.06"
[[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64"
[[ "${CARCH}" == "i686" ]] && _EFI_ARCH="i386"
@@ -23,7 +23,7 @@
pkgname="grub"
pkgdesc="GNU GRand Unified Bootloader (2)"
pkgver=2.02.beta3
-pkgrel=5
+pkgrel=6
epoch=1
url="https://www.gnu.org/software/grub/";
arch=('x86_64' 'i686')
@@ -70,7 +70,7 @@
sha256sums=('SKIP'
'SKIP'
-'6dc2596a0cec08f36de7fb066f12015b572456c90d4e06ddc7b399a3e50b5f89'
+'4246c4773ed70f78a7e27ff1118fd257a280d1102200265ad5d58bb2011195ef'
'SKIP'
'6a85a2a93a27f64bac68bef513e3239a898a0502221978b3cb99e41994021b05'
'37adb95049f6cdcbdbf60ed6b6440c5be99a4cd307a0f96c3c3837b6c2e07f3c'
[arch-commits] Commit in grub/trunk (PKGBUILD)
Date: Tuesday, November 1, 2016 @ 21:11:41
Author: eworm
Revision: 279682
download source via https
Modified:
grub/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-11-01 21:11:13 UTC (rev 279681)
+++ PKGBUILD2016-11-01 21:11:41 UTC (rev 279682)
@@ -57,8 +57,8 @@
source=("grub-${_pkgver}::git+git://git.sv.gnu.org/grub.git#tag=${_GRUB_GIT_TAG}"
"grub-extras::git+git://git.sv.gnu.org/grub-extras.git#commit=${_GRUB_EXTRAS_COMMIT}"
-
"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";
+
"https://ftp.gnu.org/gnu/unifont/unifont-${_UNIFONT_VER}/unifont-${_UNIFONT_VER}.bdf.gz";
+
"https://ftp.gnu.org/gnu/unifont/unifont-${_UNIFONT_VER}/unifont-${_UNIFONT_VER}.bdf.gz.sig";
'0001-Fix-security-issue-when-reading-username-and-passwor.patch'
'0002-intel-ucode.patch'
'0003-10_linux-detect-archlinux-initramfs.patch'
[arch-commits] Commit in grub/trunk (PKGBUILD)
Date: Wednesday, August 12, 2015 @ 11:52:18
Author: allan
Revision: 243295
add validpgpkeys
Modified:
grub/trunk/PKGBUILD
--+
PKGBUILD |1 +
1 file changed, 1 insertion(+)
Modified: PKGBUILD
===
--- PKGBUILD2015-08-12 09:52:10 UTC (rev 243294)
+++ PKGBUILD2015-08-12 09:52:18 UTC (rev 243295)
@@ -73,6 +73,7 @@
'be55eabc102f2c60b38ed35c203686d6'
'a03ffd56324520393bf574cefccb893d'
'c8b9511586d57d6f2524ae7898397a46')
+validpgpkeys=('95D2E9AB8740D8046387FD151A09227B1F435A33') #Paul Hardy
_pkgver() {
cd "${srcdir}/grub-${_pkgver}/"
[arch-commits] Commit in grub/trunk (PKGBUILD grub-intel-ucode.patch)
Date: Monday, October 27, 2014 @ 21:22:52
Author: ronald
Revision: 225397
upgpkg: grub 1:2.02.beta2-5
load intel microcode in 10_linux
Added:
grub/trunk/grub-intel-ucode.patch
Modified:
grub/trunk/PKGBUILD
+
PKGBUILD |8 +++-
grub-intel-ucode.patch | 26 ++
2 files changed, 33 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-10-27 19:29:41 UTC (rev 225396)
+++ PKGBUILD2014-10-27 20:22:52 UTC (rev 225397)
@@ -22,7 +22,7 @@
pkgname="grub"
pkgdesc="GNU GRand Unified Bootloader (2)"
pkgver=2.02.beta2
-pkgrel=4
+pkgrel=5
epoch="1"
url="https://www.gnu.org/software/grub/";
arch=('x86_64' 'i686')
@@ -57,6 +57,7 @@
"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";
'grub-10_linux-detect-archlinux-initramfs.patch'
+ 'grub-intel-ucode.patch'
'grub-add-GRUB_COLOR_variables.patch'
'60_memtest86+'
'grub.default'
@@ -67,6 +68,7 @@
'728b7439ac733a7c0d56049adec364c7'
'SKIP'
'945527e0de8d384166a4cf23439ae9ee'
+'a678629bc82c4e70c48d28242036d1d7'
'e506ae4a9f9f7d1b765febfa84e10d48'
'be55eabc102f2c60b38ed35c203686d6'
'a03ffd56324520393bf574cefccb893d'
@@ -81,6 +83,10 @@
cd "${srcdir}/grub-${_pkgver}/"
+ msg "Patch to load Intel microcode"
+ patch -Np1 -i "${srcdir}/grub-intel-ucode.patch"
+ echo
+
msg "Patch to detect of Arch Linux initramfs images by grub-mkconfig"
patch -Np1 -i "${srcdir}/grub-10_linux-detect-archlinux-initramfs.patch"
echo
Added: grub-intel-ucode.patch
===
--- grub-intel-ucode.patch (rev 0)
+++ grub-intel-ucode.patch 2014-10-27 20:22:52 UTC (rev 225397)
@@ -0,0 +1,26 @@
+diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+index d2e2a8f..f67e50f 100644
+--- a/util/grub.d/10_linux.in
b/util/grub.d/10_linux.in
+@@ -65,6 +65,12 @@ case x"$GRUB_FS" in
+ ;;
+ esac
+
++intel_ucode=
++if test -e "/boot/intel-ucode.img" ; then
++gettext_printf "Found Intel Microcode image\n" >&2
++intel_ucode="$(make_system_path_relative_to_its_root
/boot/intel-ucode.img)"
++fi
++
+ title_correction_code=
+
+ linux_entry ()
+@@ -136,7 +142,7 @@ EOF
+ message="$(gettext_printf "Loading initial ramdisk ...")"
+ sed "s/^/$submenu_indentation/" << EOF
+ echo'$(echo "$message" | grub_quote)'
+- initrd ${rel_dirname}/${initrd}
++ initrd ${intel_ucode} ${rel_dirname}/${initrd}
+ EOF
+ fi
+ sed "s/^/$submenu_indentation/" << EOF
[arch-commits] Commit in grub/trunk (PKGBUILD)
Date: Wednesday, May 14, 2014 @ 08:29:48
Author: tpowa
Revision: 212361
upgpkg: grub 1:2.02.beta2-4
enable uefi mixed mode support
Modified:
grub/trunk/PKGBUILD
--+
PKGBUILD | 117 ++---
1 file changed, 112 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-05-13 22:10:54 UTC (rev 212360)
+++ PKGBUILD2014-05-14 06:29:48 UTC (rev 212361)
@@ -1,7 +1,13 @@
# Maintainer : Tobias Powalowski
# Maintainer : Ronald van Haren
-# Contributor: Keshav Padram Amburay <(the ddoott ridikulus ddoott rat) (aatt)
(gemmaeiil) (ddoott) (ccoomm)>
+# Contributor: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt)
(gemmaeiil) (ddoott) (ccoomm)>
+## "1" to enable IA32-EFI build in Arch x86_64, "0" to disable
+_IA32_EFI_IN_ARCH_X64="1"
+
+## "1" to enable EMU build, "0" to disable
+_GRUB_EMU_BUILD="0"
+
_pkgver="2.02"
_GRUB_GIT_TAG="grub-2.02-beta2"
@@ -10,10 +16,13 @@
[[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64"
[[ "${CARCH}" == "i686" ]] && _EFI_ARCH="i386"
+[[ "${CARCH}" == "x86_64" ]] && _EMU_ARCH="x86_64"
+[[ "${CARCH}" == "i686" ]] && _EMU_ARCH="i386"
+
pkgname="grub"
pkgdesc="GNU GRand Unified Bootloader (2)"
pkgver=2.02.beta2
-pkgrel=3
+pkgrel=4
epoch="1"
url="https://www.gnu.org/software/grub/";
arch=('x86_64' 'i686')
@@ -22,9 +31,9 @@
install="${pkgname}.install"
options=('!makeflags')
-conflicts=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}" 'grub-legacy')
-replaces=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}")
-provides=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}")
+conflicts=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}"
'grub-legacy')
+replaces=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}")
+provides=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}")
makedepends=('git' 'rsync' 'xz' 'freetype2' 'ttf-dejavu' 'python' 'autogen'
'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse')
@@ -37,6 +46,12 @@
'os-prober: To detect other OSes when generating grub.cfg in BIOS
systems'
'mtools: For grub-mkrescue FAT FS support')
+if [[ "${_GRUB_EMU_BUILD}" == "1" ]]; then
+makedepends+=('libusbx' 'sdl')
+optdepends+=('libusbx: For grub-emu USB support'
+ 'sdl: For grub-emu SDL support')
+fi
+
source=("grub-${_pkgver}::git+git://git.sv.gnu.org/grub.git#tag=${_GRUB_GIT_TAG}"
"grub-extras::git+git://git.sv.gnu.org/grub-extras.git#branch=master"
"http://ftp.gnu.org/gnu/unifont/unifont-${_UNIFONT_VER}/unifont-${_UNIFONT_VER}.bdf.gz";
@@ -212,6 +227,57 @@
}
+_build_grub-emu() {
+
+ msg "Copy the source for building the emu part"
+ cp -r "${srcdir}/grub-${_pkgver}/" "${srcdir}/grub-${_pkgver}-emu/"
+
+ msg "Unset all compiler FLAGS for emu build"
+ unset CFLAGS
+ unset CPPFLAGS
+ unset CXXFLAGS
+ unset LDFLAGS
+ unset MAKEFLAGS
+
+ cd "${srcdir}/grub-${_pkgver}-emu/"
+
+ msg "Run autogen.sh for emu build"
+ ./autogen.sh
+ echo
+
+ msg "Run ./configure for emu build"
+ ./configure \
+ --with-platform="emu" \
+ --target="${_EMU_ARCH}" \
+ --enable-mm-debug \
+ --enable-nls \
+ --enable-device-mapper \
+ --enable-cache-stats \
+ --enable-grub-mkfont \
+ --enable-grub-mount \
+ --enable-grub-emu-usb=no \
+ --enable-grub-emu-sdl=no \
+ --disable-grub-emu-pci \
+ --prefix="/usr" \
+ --bindir="/usr/bin" \
+ --sbindir="/usr/bin" \
+ --mandir="/usr/share/man" \
+ --infodir="/usr/share/info" \
+ --datarootdir="/usr/share" \
+ --sysconfdir="/etc" \
+ --program-prefix="" \
+ --with-bootdir="/boot" \
+ --with-grubdir="grub" \
+ --disable-silent-rules \
+ --disable-werror
+ echo
+
+ msg "Run make for emu build"
+ make
+ echo
+
+}
+
build() {
cd "${srcdir}/grub-${_pkgver}/"
@@ -224,6 +290,18 @@
_build_grub-efi
echo
+ if [[ "${CARCH}" == "x86_64" ]] && [[ "${_IA32_EFI_IN_ARCH_X64}" == "1"
]]; then
+ msg "Build grub i386 efi stuff"
+ _EFI_ARCH="i386" _build_grub-efi
+ echo
+ fi
+
+ if [[ "${_GRUB_EMU_BUILD}" == "1" ]]; then
+ msg "Build grub emu stuff"
+ _build_grub-emu
+ echo
+ fi
+
}
_package_grub-common_and_bios() {
@@ -265,11 +343,40 @@
}
+_package_grub-emu() {
+
+ cd "${srcdir}/grub-${_pkgver}-emu/"
+
+ msg "Run mak
[arch-commits] Commit in grub/trunk (PKGBUILD)
Date: Tuesday, February 25, 2014 @ 12:37:12
Author: tpowa
Revision: 206399
upgpkg: grub 1:2.02.beta2-2
fix 10_archlinux to reduce issues with entries
Modified:
grub/trunk/PKGBUILD
--+
PKGBUILD | 11 +--
1 file changed, 1 insertion(+), 10 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-02-25 11:32:23 UTC (rev 206398)
+++ PKGBUILD2014-02-25 11:37:12 UTC (rev 206399)
@@ -51,7 +51,7 @@
'728b7439ac733a7c0d56049adec364c7'
'SKIP'
'e506ae4a9f9f7d1b765febfa84e10d48'
- 'cc988384d9b3bfb61384342e3e1f28c3'
+ 'dcf3e0b47119b0bb06ce987c8f030ffa'
'be55eabc102f2c60b38ed35c203686d6'
'a03ffd56324520393bf574cefccb893d'
'c8b9511586d57d6f2524ae7898397a46')
@@ -272,12 +272,3 @@
_package_grub-common_and_bios
}
-md5sums=('SKIP'
- 'SKIP'
- '728b7439ac733a7c0d56049adec364c7'
- 'SKIP'
- 'e506ae4a9f9f7d1b765febfa84e10d48'
- 'dcf3e0b47119b0bb06ce987c8f030ffa'
- 'be55eabc102f2c60b38ed35c203686d6'
- 'a03ffd56324520393bf574cefccb893d'
- 'c8b9511586d57d6f2524ae7898397a46')
[arch-commits] Commit in grub/trunk (PKGBUILD archlinux_grub_mkconfig_fixes.patch)
Date: Monday, November 25, 2013 @ 08:51:03
Author: tpowa
Revision: 200303
upgpkg: grub 1:2.00.1282.g5ae5c54-1
bump to latest version
Modified:
grub/trunk/PKGBUILD
grub/trunk/archlinux_grub_mkconfig_fixes.patch
-+
PKGBUILD| 17 +++--
archlinux_grub_mkconfig_fixes.patch | 14 +++---
2 files changed, 18 insertions(+), 13 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-11-25 03:55:25 UTC (rev 200302)
+++ PKGBUILD2013-11-25 07:51:03 UTC (rev 200303)
@@ -1,9 +1,9 @@
# Maintainer : Tobias Powalowski
# Maintainer : Ronald van Haren
-# Contributor: Keshav Padram Amburay (the.ridikulus.rat) (aatt) (gemmaeiil)
(ddoott) (ccoomm)>
+# Contributor: Keshav Padram Amburay <(the ddoott ridikulus ddoott rat) (aatt)
(gemmaeiil) (ddoott) (ccoomm)>
_pkgver="2.00"
-_GRUB_GIT_COMMIT="93c120754a537a2f060b8e20eab620e714309b82"
+_GRUB_GIT_COMMIT="5ae5c54c7e5cb048cdd78a53181cee0da698a953"
## grub-extras gpxe is not needed
@@ -12,7 +12,7 @@
pkgname="grub"
pkgdesc="GNU GRand Unified Bootloader (2)"
-pkgver=2.00.963.g93c1207
+pkgver=2.00.1282.g5ae5c54
pkgrel=1
epoch="1"
url="https://www.gnu.org/software/grub/";
@@ -26,8 +26,8 @@
replaces=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}")
provides=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}")
-makedepends=('git' 'bzr' 'rsync' 'xz' 'freetype2' 'bdf-unifont'
- 'ttf-dejavu' 'python2' 'autogen' 'texinfo' 'help2man'
+makedepends=('git' 'bzr' 'rsync' 'xz' 'freetype2' 'ttf-dejavu'
+ 'python2' 'autogen' 'texinfo' 'help2man'
'gettext' 'device-mapper' 'fuse')
depends=('sh' 'xz' 'gettext' 'device-mapper')
optdepends=('freetype2: For grub-mkfont usage'
@@ -40,6 +40,7 @@
# source=("http://ftp.gnu.org/gnu/grub/grub-${pkgver}.tar.xz";
source=("grub-${_pkgver}::git+git://git.sv.gnu.org/grub.git#commit=${_GRUB_GIT_COMMIT}"
+'http://unifoundry.com/unifont-5.1.20080820.bdf.gz'
'archlinux_grub_mkconfig_fixes.patch'
'60_memtest86+'
'grub.default'
@@ -46,7 +47,8 @@
'grub.cfg')
md5sums=('SKIP'
- 'ee1262cc4e20031df019779b1a4b1e39'
+ '6b8263ceccef33bd633aa019d74b7943'
+ 'b9cbff4a67e463722a113c66d57c4042'
'be55eabc102f2c60b38ed35c203686d6'
'a03ffd56324520393bf574cefccb893d'
'c8b9511586d57d6f2524ae7898397a46'
@@ -89,6 +91,9 @@
msg "Remove non working langs which need LC_ALL=C.UTF-8"
sed -e 's#en@cyrillic en@greek##g' -i
"${srcdir}/grub-${_pkgver}/po/LINGUAS"
+ msg "Avoid problem with unifont during compile of grub,
http://savannah.gnu.org/bugs/?40330 and https://bugs.archlinux.org/task/37847";
+ cp "${srcdir}/unifont-5.1.20080820.bdf"
"${srcdir}/grub-${_pkgver}/unifont.bdf"
+
}
_build_grub-common_and_bios() {
Modified: archlinux_grub_mkconfig_fixes.patch
===
--- archlinux_grub_mkconfig_fixes.patch 2013-11-25 03:55:25 UTC (rev 200302)
+++ archlinux_grub_mkconfig_fixes.patch 2013-11-25 07:51:03 UTC (rev 200303)
@@ -1,5 +1,5 @@
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 8decc1d..170047f 100644
+index db58ab9..e66e139 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -212,6 +212,8 @@ export GRUB_DEFAULT \
@@ -12,7 +12,7 @@
GRUB_SAVEDEFAULT \
GRUB_ENABLE_CRYPTODISK \
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
-index 2c4bb0a..c7120d2 100644
+index 9838720..dbb5dd2 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -125,6 +125,14 @@ cat <
[arch-commits] Commit in grub/trunk (PKGBUILD)
Date: Wednesday, October 30, 2013 @ 11:29:15
Author: tpowa
Revision: 197795
upgpkg: grub 1:2.00.963.g93c1207-1
bump to latest version, remove broken lua extras
Modified:
grub/trunk/PKGBUILD
--+
PKGBUILD | 17 +
1 file changed, 9 insertions(+), 8 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-10-30 08:55:59 UTC (rev 197794)
+++ PKGBUILD2013-10-30 10:29:15 UTC (rev 197795)
@@ -3,7 +3,7 @@
# Contributor: Keshav Padram Amburay (the.ridikulus.rat) (aatt) (gemmaeiil)
(ddoott) (ccoomm)>
_pkgver="2.00"
-_GRUB_GIT_COMMIT="bca274b45597725f21f77a773087b62a2922eb2b"
+_GRUB_GIT_COMMIT="93c120754a537a2f060b8e20eab620e714309b82"
## grub-extras gpxe is not needed
@@ -12,7 +12,7 @@
pkgname="grub"
pkgdesc="GNU GRand Unified Bootloader (2)"
-pkgver=2.00.900.gbca274b
+pkgver=2.00.963.g93c1207
pkgrel=1
epoch="1"
url="https://www.gnu.org/software/grub/";
@@ -26,8 +26,9 @@
replaces=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}")
provides=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}")
-makedepends=('git' 'bzr' 'rsync' 'xz' 'freetype2' 'bdf-unifont' 'ttf-dejavu'
'python'
- 'autogen' 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse')
+makedepends=('git' 'bzr' 'rsync' 'xz' 'freetype2' 'bdf-unifont'
+ 'ttf-dejavu' 'python2' 'autogen' 'texinfo' 'help2man'
+ 'gettext' 'device-mapper' 'fuse')
depends=('sh' 'xz' 'gettext' 'device-mapper')
optdepends=('freetype2: For grub-mkfont usage'
'fuse: For grub-mount usage'
@@ -78,8 +79,8 @@
msg "Fix OS naming FS#33393"
sed 's|GNU/Linux|Linux|' -i
"${srcdir}/grub-${_pkgver}/util/grub.d/10_linux.in"
- # msg "Requires python2"
- # sed 's|python |python2 |g' -i "${srcdir}/grub-${_pkgver}/autogen.sh"
+ msg "autogen.sh requires python (2/3). since bzr is in makedepends, use
python2 and no need to pull python3"
+ sed 's|python |python2 |g' -i "${srcdir}/grub-${_pkgver}/autogen.sh"
msg "Pull in latest language files"
./linguas.sh
@@ -105,7 +106,7 @@
msg "Add the grub-extra sources for bios build"
install -d "${srcdir}/grub-${_pkgver}-bios/grub-extras"
- for _DIR_ in 915resolution lua ntldr-img ; do
+ for _DIR_ in 915resolution ntldr-img ; do
cp -r "${srcdir}/grub-extras-${_DIR_}"
"${srcdir}/grub-${_pkgver}-bios/grub-extras/${_DIR_}"
done
export GRUB_CONTRIB="${srcdir}/grub-bios/grub-extras/"
@@ -165,7 +166,7 @@
for _DIR_ in lua ; do
cp -r "${srcdir}/grub-extras-${_DIR_}"
"${srcdir}/grub-${_pkgver}-efi/grub-extras/${_DIR_}"
done
- export GRUB_CONTRIB="${srcdir}/grub-efi/grub-extras/"
+ # export GRUB_CONTRIB="${srcdir}/grub-efi/grub-extras/"
msg "Unset all compiler FLAGS for efi build"
unset CFLAGS
[arch-commits] Commit in grub/trunk (PKGBUILD)
Date: Wednesday, October 30, 2013 @ 09:41:42
Author: tpowa
Revision: 197792
fix #37530 add bzr and rsync to makedepends
Modified:
grub/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-10-30 08:14:34 UTC (rev 197791)
+++ PKGBUILD2013-10-30 08:41:42 UTC (rev 197792)
@@ -26,7 +26,7 @@
replaces=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}")
provides=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}")
-makedepends=('git' 'xz' 'freetype2' 'bdf-unifont' 'ttf-dejavu' 'python'
+makedepends=('git' 'bzr' 'rsync' 'xz' 'freetype2' 'bdf-unifont' 'ttf-dejavu'
'python'
'autogen' 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse')
depends=('sh' 'xz' 'gettext' 'device-mapper')
optdepends=('freetype2: For grub-mkfont usage'
[arch-commits] Commit in grub/trunk (PKGBUILD)
Date: Thursday, October 24, 2013 @ 08:57:52
Author: tpowa
Revision: 197220
remove double git makedepend
Modified:
grub/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-10-24 06:42:35 UTC (rev 197219)
+++ PKGBUILD2013-10-24 06:57:52 UTC (rev 197220)
@@ -26,7 +26,7 @@
replaces=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}")
provides=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}")
-makedepends=('git' 'git' 'xz' 'freetype2' 'bdf-unifont' 'ttf-dejavu' 'python'
+makedepends=('git' 'xz' 'freetype2' 'bdf-unifont' 'ttf-dejavu' 'python'
'autogen' 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse')
depends=('sh' 'xz' 'gettext' 'device-mapper')
optdepends=('freetype2: For grub-mkfont usage'
[arch-commits] Commit in grub/trunk (PKGBUILD)
Date: Thursday, October 24, 2013 @ 08:42:35
Author: tpowa
Revision: 197219
replace bzr with git in makedepends
Modified:
grub/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-10-24 05:09:05 UTC (rev 197218)
+++ PKGBUILD2013-10-24 06:42:35 UTC (rev 197219)
@@ -26,7 +26,7 @@
replaces=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}")
provides=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}")
-makedepends=('git' 'bzr' 'xz' 'freetype2' 'bdf-unifont' 'ttf-dejavu' 'python'
+makedepends=('git' 'git' 'xz' 'freetype2' 'bdf-unifont' 'ttf-dejavu' 'python'
'autogen' 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse')
depends=('sh' 'xz' 'gettext' 'device-mapper')
optdepends=('freetype2: For grub-mkfont usage'
[arch-commits] Commit in grub/trunk (PKGBUILD)
Date: Wednesday, October 23, 2013 @ 22:28:51
Author: tpowa
Revision: 197201
upgpkg: grub 1:2.00.900.gbca274b-1
bump to latest version, updated to git
Modified:
grub/trunk/PKGBUILD
--+
PKGBUILD | 175 ++---
1 file changed, 100 insertions(+), 75 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-10-23 17:37:48 UTC (rev 197200)
+++ PKGBUILD2013-10-23 20:28:51 UTC (rev 197201)
@@ -1,18 +1,20 @@
# Maintainer : Tobias Powalowski
# Maintainer : Ronald van Haren
-# Contributor: Keshav Padram (the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott)
(ccoomm)>
+# Contributor: Keshav Padram Amburay (the.ridikulus.rat) (aatt) (gemmaeiil)
(ddoott) (ccoomm)>
-_GRUB_BZR_REV="5086"
+_pkgver="2.00"
+_GRUB_GIT_COMMIT="bca274b45597725f21f77a773087b62a2922eb2b"
-## grub-extras lua and gpxe fail to build with grub bzr rev 5043
+## grub-extras gpxe is not needed
[[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64"
[[ "${CARCH}" == "i686" ]] && _EFI_ARCH="i386"
-pkgname=grub
+pkgname="grub"
pkgdesc="GNU GRand Unified Bootloader (2)"
-pkgver=2.00.${_GRUB_BZR_REV}
+pkgver=2.00.900.gbca274b
pkgrel=1
+epoch="1"
url="https://www.gnu.org/software/grub/";
arch=('x86_64' 'i686')
license=('GPL3')
@@ -24,8 +26,8 @@
replaces=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}")
provides=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}")
-makedepends=('xz' 'freetype2' 'bdf-unifont' 'ttf-dejavu' 'python' 'autogen'
- 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse' 'bzr')
+makedepends=('git' 'bzr' 'xz' 'freetype2' 'bdf-unifont' 'ttf-dejavu' 'python'
+ 'autogen' 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse')
depends=('sh' 'xz' 'gettext' 'device-mapper')
optdepends=('freetype2: For grub-mkfont usage'
'fuse: For grub-mount usage'
@@ -36,48 +38,79 @@
'mtools: For grub-mkrescue FAT FS support')
# source=("http://ftp.gnu.org/gnu/grub/grub-${pkgver}.tar.xz";
-source=("grub-${pkgver}::bzr+bzr://bzr.savannah.gnu.org/grub/trunk/grub/#revision=${_GRUB_BZR_REV}"
+source=("grub-${_pkgver}::git+git://git.sv.gnu.org/grub.git#commit=${_GRUB_GIT_COMMIT}"
'archlinux_grub_mkconfig_fixes.patch'
'60_memtest86+'
'grub.default'
-'grub.cfg'
-'grub-2.00-mkinitcpio-0.15.patch'
-'grub-2.00.5086-fix-lvm-parsing.patch')
+'grub.cfg')
+
md5sums=('SKIP'
'ee1262cc4e20031df019779b1a4b1e39'
'be55eabc102f2c60b38ed35c203686d6'
'a03ffd56324520393bf574cefccb893d'
'c8b9511586d57d6f2524ae7898397a46'
- 'd25d2dcf8ba708dcf768fcaea799f59c'
- '7a0ce6aa4a23fa12e1f79ab03fe63f88'
'SKIP'
+ 'SKIP'
'SKIP')
-for _DIR_ in 915resolution ntldr-img ; do
+for _DIR_ in 915resolution lua ntldr-img ; do
source+=("grub-extras-${_DIR_}::bzr+bzr://bzr.savannah.gnu.org/grub-extras/${_DIR_}/#revision=")
done
+pkgver() {
+ cd "${srcdir}/grub-${_pkgver}/"
+ echo "$(git describe --tags)" | sed -e 's|-|\.|g'
+}
+
prepare() {
- cd "${srcdir}/grub-${pkgver}"
- patch -Np0 -i "${srcdir}/grub-2.00-mkinitcpio-0.15.patch"
- patch -Np1 -i "${srcdir}/grub-2.00.5086-fix-lvm-parsing.patch"
+
+ cd "${srcdir}/grub-${_pkgver}/"
+
+ msg "Patch to enable grub-mkconfig detect Arch kernels and initramfs"
+ patch -Np1 -i "${srcdir}/archlinux_grub_mkconfig_fixes.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 "Fix mkinitcpio 'rw' FS#36275"
+ sed 's| ro | rw |g' -i
"${srcdir}/grub-${_pkgver}/util/grub.d/10_linux.in"
+
+ msg "Fix OS naming FS#33393"
+ sed 's|GNU/Linux|Linux|' -i
"${srcdir}/grub-${_pkgver}/util/grub.d/10_linux.in"
+
+ # msg "Requires python2"
+ # sed 's|python |python2 |g' -i "${srcdir}/grub-${_pkgver}/autogen.sh"
+
+ msg "Pull in latest language files"
+ ./linguas.sh
+ echo
+
+ msg "Remove non working langs which need LC_ALL=C.UTF-8"
+ sed -e 's#en@cyrillic en@greek##g' -i
"${srcdir}/grub-${_pkgver}/po/LINGUAS"
+
}
_build_grub-common_and_bios() {
- ## Copy the source for building the common/bios package
- cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-${pkgver}-bios"
- cd "${srcdir}/grub-${pkgver}-bios/"
+ msg "Set ARCH dependent variables for bios build"
+ if [[ "${CARCH}" == 'x86_64' ]]; then
+ _EFIEMU="--enable-efiemu"
+ else
+ _EFIEMU="--disable-efiemu"
+ fi
- ## Add the grub-extra sources
- export GRUB_CONTRIB="${srcdir}/grub-${pkgver}-bios/gr
[arch-commits] Commit in grub/trunk (PKGBUILD grub-2.00.5086-fix-lvm-parsing.patch)
Date: Monday, August 5, 2013 @ 18:03:28
Author: tpowa
Revision: 192070
upgpkg: grub 2.00.5086-1
fix #36349
Added:
grub/trunk/grub-2.00.5086-fix-lvm-parsing.patch
Modified:
grub/trunk/PKGBUILD
--+
PKGBUILD | 10 +++---
grub-2.00.5086-fix-lvm-parsing.patch | 54 +
2 files changed, 60 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-08-05 15:40:48 UTC (rev 192069)
+++ PKGBUILD2013-08-05 16:03:28 UTC (rev 192070)
@@ -2,7 +2,7 @@
# Maintainer : Ronald van Haren
# Contributor: Keshav Padram (the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott)
(ccoomm)>
-_GRUB_BZR_REV="5043"
+_GRUB_BZR_REV="5086"
## grub-extras lua and gpxe fail to build with grub bzr rev 5043
@@ -12,7 +12,7 @@
pkgname=grub
pkgdesc="GNU GRand Unified Bootloader (2)"
pkgver=2.00.${_GRUB_BZR_REV}
-pkgrel=4
+pkgrel=1
url="https://www.gnu.org/software/grub/";
arch=('x86_64' 'i686')
license=('GPL3')
@@ -41,17 +41,18 @@
'60_memtest86+'
'grub.default'
'grub.cfg'
-'grub-2.00-mkinitcpio-0.15.patch')
+'grub-2.00-mkinitcpio-0.15.patch'
+'grub-2.00.5086-fix-lvm-parsing.patch')
md5sums=('SKIP'
'ee1262cc4e20031df019779b1a4b1e39'
'be55eabc102f2c60b38ed35c203686d6'
'a03ffd56324520393bf574cefccb893d'
'c8b9511586d57d6f2524ae7898397a46'
'd25d2dcf8ba708dcf768fcaea799f59c'
+ '7a0ce6aa4a23fa12e1f79ab03fe63f88'
'SKIP'
'SKIP')
-
for _DIR_ in 915resolution ntldr-img ; do
source+=("grub-extras-${_DIR_}::bzr+bzr://bzr.savannah.gnu.org/grub-extras/${_DIR_}/#revision=")
done
@@ -59,6 +60,7 @@
prepare() {
cd "${srcdir}/grub-${pkgver}"
patch -Np0 -i "${srcdir}/grub-2.00-mkinitcpio-0.15.patch"
+ patch -Np1 -i "${srcdir}/grub-2.00.5086-fix-lvm-parsing.patch"
}
_build_grub-common_and_bios() {
Added: grub-2.00.5086-fix-lvm-parsing.patch
===
--- grub-2.00.5086-fix-lvm-parsing.patch(rev 0)
+++ grub-2.00.5086-fix-lvm-parsing.patch2013-08-05 16:03:28 UTC (rev
192070)
@@ -0,0 +1,54 @@
+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
+
+---
+ 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;
\ No newline at end of file
[arch-commits] Commit in grub/trunk (PKGBUILD grub.cfg)
Date: Monday, July 29, 2013 @ 11:29:11
Author: tpowa
Revision: 191688
upgpkg: grub 2.00.5043-4
fix default config for mkinitcpio-0.15
Modified:
grub/trunk/PKGBUILD
grub/trunk/grub.cfg
--+
PKGBUILD |6 +++---
grub.cfg |4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-07-29 09:19:31 UTC (rev 191687)
+++ PKGBUILD2013-07-29 09:29:11 UTC (rev 191688)
@@ -12,7 +12,7 @@
pkgname=grub
pkgdesc="GNU GRand Unified Bootloader (2)"
pkgver=2.00.${_GRUB_BZR_REV}
-pkgrel=3
+pkgrel=4
url="https://www.gnu.org/software/grub/";
arch=('x86_64' 'i686')
license=('GPL3')
@@ -46,11 +46,12 @@
'ee1262cc4e20031df019779b1a4b1e39'
'be55eabc102f2c60b38ed35c203686d6'
'a03ffd56324520393bf574cefccb893d'
- 'f184b060fe22eca662ad455c69241496'
+ 'c8b9511586d57d6f2524ae7898397a46'
'd25d2dcf8ba708dcf768fcaea799f59c'
'SKIP'
'SKIP')
+
for _DIR_ in 915resolution ntldr-img ; do
source+=("grub-extras-${_DIR_}::bzr+bzr://bzr.savannah.gnu.org/grub-extras/${_DIR_}/#revision=")
done
@@ -246,4 +247,3 @@
_package_grub-common_and_bios
}
-
Modified: grub.cfg
===
--- grub.cfg2013-07-29 09:19:31 UTC (rev 191687)
+++ grub.cfg2013-07-29 09:29:11 UTC (rev 191688)
@@ -91,7 +91,7 @@
search --no-floppy --fs-uuid --set=root
ad4103fa-d940-47ca-8506-301d8071d467
fi
echo'Loading Linux core repo kernel ...'
- linux /boot/vmlinuz-linux
root=UUID=ad4103fa-d940-47ca-8506-301d8071d467 ro quiet
+ linux /boot/vmlinuz-linux
root=UUID=ad4103fa-d940-47ca-8506-301d8071d467 rw quiet
echo'Loading initial ramdisk ...'
initrd /boot/initramfs-linux.img
}
@@ -108,7 +108,7 @@
search --no-floppy --fs-uuid --set=root
ad4103fa-d940-47ca-8506-301d8071d467
fi
echo'Loading Linux core repo kernel ...'
- linux /boot/vmlinuz-linux
root=UUID=ad4103fa-d940-47ca-8506-301d8071d467 ro quiet
+ linux /boot/vmlinuz-linux
root=UUID=ad4103fa-d940-47ca-8506-301d8071d467 rw quiet
echo'Loading initial ramdisk ...'
initrd /boot/initramfs-linux-fallback.img
}
[arch-commits] Commit in grub/trunk (PKGBUILD grub-2.00-mkinitcpio-0.15.patch)
Date: Sunday, July 28, 2013 @ 09:40:09
Author: tpowa
Revision: 191624
upgpkg: grub 2.00.5043-3
fix 10_linux
Added:
grub/trunk/grub-2.00-mkinitcpio-0.15.patch
Modified:
grub/trunk/PKGBUILD
-+
PKGBUILD| 26 --
grub-2.00-mkinitcpio-0.15.patch | 11 +++
2 files changed, 27 insertions(+), 10 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-07-28 06:24:44 UTC (rev 191623)
+++ PKGBUILD2013-07-28 07:40:09 UTC (rev 191624)
@@ -12,7 +12,7 @@
pkgname=grub
pkgdesc="GNU GRand Unified Bootloader (2)"
pkgver=2.00.${_GRUB_BZR_REV}
-pkgrel=2
+pkgrel=3
url="https://www.gnu.org/software/grub/";
arch=('x86_64' 'i686')
license=('GPL3')
@@ -40,20 +40,25 @@
'archlinux_grub_mkconfig_fixes.patch'
'60_memtest86+'
'grub.default'
-'grub.cfg')
+'grub.cfg'
+'grub-2.00-mkinitcpio-0.15.patch')
+md5sums=('SKIP'
+ 'ee1262cc4e20031df019779b1a4b1e39'
+ 'be55eabc102f2c60b38ed35c203686d6'
+ 'a03ffd56324520393bf574cefccb893d'
+ 'f184b060fe22eca662ad455c69241496'
+ 'd25d2dcf8ba708dcf768fcaea799f59c'
+ 'SKIP'
+ 'SKIP')
for _DIR_ in 915resolution ntldr-img ; do
source+=("grub-extras-${_DIR_}::bzr+bzr://bzr.savannah.gnu.org/grub-extras/${_DIR_}/#revision=")
done
-# sha1sums=('274d91e96b56a5b9dd0a07accff69dbb6dfb596b'
-sha1sums=('SKIP'
- 'e7fd9161057411b1adc22977d4b3e7c06116239d'
- '2aa2deeb7d7dc56f389aa1487b7a57b0d44ce559'
- 'dbf493dec4722feb11f0b5c71ad453a18daf0fc5'
- '5b7fcb0718a23035c039eb2fda9e088bb13ae611'
- 'SKIP'
- 'SKIP')
+prepare() {
+ cd "${srcdir}/grub-${pkgver}"
+ patch -Np0 -i "${srcdir}/grub-2.00-mkinitcpio-0.15.patch"
+}
_build_grub-common_and_bios() {
@@ -241,3 +246,4 @@
_package_grub-common_and_bios
}
+
Added: grub-2.00-mkinitcpio-0.15.patch
===
--- grub-2.00-mkinitcpio-0.15.patch (rev 0)
+++ grub-2.00-mkinitcpio-0.15.patch 2013-07-28 07:40:09 UTC (rev 191624)
@@ -0,0 +1,11 @@
+--- util/grub.d/10_linux.in.old2013-07-28 08:55:47.825946239 +0200
util/grub.d/10_linux.in2013-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.
[arch-commits] Commit in grub/trunk (PKGBUILD)
Date: Wednesday, June 26, 2013 @ 20:33:33
Author: tpowa
Revision: 188948
upgpkg: grub 2.00.5043-2
fix .mo files for bzr branch
Modified:
grub/trunk/PKGBUILD
--+
PKGBUILD |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-06-26 12:38:20 UTC (rev 188947)
+++ PKGBUILD2013-06-26 18:33:33 UTC (rev 188948)
@@ -12,7 +12,7 @@
pkgname=grub
pkgdesc="GNU GRand Unified Bootloader (2)"
pkgver=2.00.${_GRUB_BZR_REV}
-pkgrel=1
+pkgrel=2
url="https://www.gnu.org/software/grub/";
arch=('x86_64' 'i686')
license=('GPL3')
@@ -183,7 +183,11 @@
## Requires python2
# sed 's|python |python2 |g' -i "${srcdir}/grub-${pkgver}/autogen.sh"
-
+
+## pull in language files
+./linguas.sh
+# remove not working langs which need LC_ALL=C.UTF-8
+sed -i -e 's#en@cyrillic en@greek##g' po/LINGUAS
_build_grub-common_and_bios
echo
[arch-commits] Commit in grub/trunk (PKGBUILD)
Date: Saturday, June 22, 2013 @ 12:15:33
Author: tpowa
Revision: 188835
upgpkg: grub 2.00-1
remove any packages
Modified:
grub/trunk/PKGBUILD
--+
PKGBUILD | 343 -
1 file changed, 163 insertions(+), 180 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-06-22 10:03:56 UTC (rev 188834)
+++ PKGBUILD2013-06-22 10:15:33 UTC (rev 188835)
@@ -1,95 +1,94 @@
-# Maintainer: Ronald van Haren
-# Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott)
(ccoomm)>
+# Maintainer : Tobias Powalowski
+# Maintainer : Ronald van Haren
+# Contributor: Keshav Padram (the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott)
(ccoomm)>
-_grub_lua_ver=24
-_grub_ntldr_ver=21
-_grub_915_ver=9
+## grub-extras lua and gpxe fail to build
-pkgname=('grub-common' 'grub-bios' 'grub-efi-i386')
-pkgbase=grub
+[[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64"
+[[ "${CARCH}" == "i686" ]] && _EFI_ARCH="i386"
+
+pkgname=grub
+pkgdesc="GNU GRand Unified Bootloader (2)"
pkgver=2.00
-pkgrel=5
+pkgrel=1
url="https://www.gnu.org/software/grub/";
-arch=('i686' 'x86_64')
+arch=('x86_64' 'i686')
license=('GPL3')
+backup=('boot/grub/grub.cfg' 'etc/default/grub' 'etc/grub.d/40_custom')
+install="${pkgname}.install"
+options=('!makeflags')
+
+conflicts=('grub-legacy' 'grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}")
+replaces=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}")
+provides=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}")
+
makedepends=('xz' 'freetype2' 'bdf-unifont' 'ttf-dejavu' 'python' 'autogen'
- 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse')
+ 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse' 'bzr')
+depends=('sh' 'xz' 'gettext' 'device-mapper')
+optdepends=('freetype2: For grub-mkfont usage'
+'fuse: For grub-mount usage'
+'dosfstools: For EFI support'
+'efibootmgr: For grub-install EFI support'
+'libisoburn: Provides xorriso for generating grub rescue iso using
grub-mkrescue'
+'os-prober: To detect other OSes when generating grub.cfg in BIOS
systems'
+'mtools: For grub-mkrescue FAT FS support')
source=("http://ftp.gnu.org/gnu/grub/grub-${pkgver}.tar.xz";
-
"ftp://ftp.archlinux.org/other/grub2/grub2_extras_lua_r${_grub_lua_ver}.tar.xz";
-
"ftp://ftp.archlinux.org/other/grub2/grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz";
-
"ftp://ftp.archlinux.org/other/grub2/grub2_extras_915resolution_r${_grub_915_ver}.tar.xz";
+'0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch'
+'grub-2.00-fix-docs.patch'
'archlinux_grub_mkconfig_fixes.patch'
+'60_memtest86+'
'grub.default'
-'grub.cfg'
-'60_memtest86+'
-'grub_bzr_export.sh'
-'0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch'
-'grub-2.00-fix-docs.patch')
-md5sums=('a1043102fbc7bcedbf53e7ee3d17ab91'
- '704ea9f250b6137f05fa0197fd07053a'
- '77f7d5f8ce395663cd7fff4d37099957'
- 'a80e2b1d3bab778c3b6117d5a698992f'
- '3b3dae993939b4e323f19365dd830e12'
- 'a03ffd56324520393bf574cefccb893d'
- 'f184b060fe22eca662ad455c69241496'
- 'be55eabc102f2c60b38ed35c203686d6'
- 'f343ed2340ebc86c427873641bb72419'
- 'ab751d1d8cd3fd47e5ee24d71ecc31ed'
- '342dd18472a24e5fd252458b24f39a29')
+'grub.cfg')
-noextract=("grub2_extras_lua_r${_grub_lua_ver}.tar.xz"
- "grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz"
- "grub2_extras_915resolution_r${_grub_915_ver}.tar.xz")
+for _DIR_ in 915resolution ntldr-img ; do
+
source+=("grub-extras-${_DIR_}::bzr+bzr://bzr.savannah.gnu.org/grub-extras/${_DIR_}/")
+done
+source+=("grub-extras-lua::bzr+bzr://bzr.savannah.gnu.org/grub-extras/lua/#revision=24"
+
"grub-extras-gpxe::bzr+bzr://bzr.savannah.gnu.org/grub-extras/gpxe/#revision=13")
+sha1sums=('274d91e96b56a5b9dd0a07accff69dbb6dfb596b'
+ 'b68565bc155094bade390c257c3f31bc55ae244b'
+ '1dc08391bb13f8e23faa21a76cc4cc4b25467702'
+ '26e4e946190bea1f03632658cf08ba90e11dec57'
+ '2aa2deeb7d7dc56f389aa1487b7a57b0d44ce559'
+ 'dbf493dec4722feb11f0b5c71ad453a18daf0fc5'
+ '5b7fcb0718a23035c039eb2fda9e088bb13ae611'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP')
+
_build_grub-common_and_bios() {
-
- ## copy the source for building the common/bios package
- cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub_bios-${pkgver}"
- cd "${srcdir}/grub_bios-${pkgver}"
-
- ## Apply Archlinux specific fixes to enable grub-mkconfig detect Arch
kernels and initramfs
- patch -Np1 -i "${srcdir}/archlinux_grub_mkconfig_fixes.patch"
- echo
-
- ## fix unifont.bdf location so that grub-mkfont can create
[arch-commits] Commit in grub/trunk (PKGBUILD)
Date: Monday, June 17, 2013 @ 10:01:28
Author: tpowa
Revision: 188632
upgpkg: grub 2.00-3
make freetype2 and fuse as optdepends
Modified:
grub/trunk/PKGBUILD
--+
PKGBUILD |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-06-17 06:43:10 UTC (rev 188631)
+++ PKGBUILD2013-06-17 08:01:28 UTC (rev 188632)
@@ -8,11 +8,11 @@
pkgname=('grub-common' 'grub-bios' 'grub-efi-i386')
pkgbase=grub
pkgver=2.00
-pkgrel=2
+pkgrel=3
url="https://www.gnu.org/software/grub/";
arch=('i686' 'x86_64')
license=('GPL3')
-makedepends=('xz' 'bdf-unifont' 'ttf-dejavu' 'python' 'autogen'
+makedepends=('xz' 'freetype2' 'bdf-unifont' 'ttf-dejavu' 'python' 'autogen'
'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse')
source=("http://ftp.gnu.org/gnu/grub/grub-${pkgver}.tar.xz";
@@ -180,7 +180,9 @@
package_grub-common() {
pkgdesc="GNU GRand Unified Bootloader - Utilities and Common Files"
- depends=('sh' 'xz' 'freetype2' 'gettext' 'device-mapper' 'fuse')
+ depends=('sh' 'xz' 'gettext' 'device-mapper')
+optdepends=('freetype2: for grub-mkfont usage'
+'fuse: for grub-mount usage')
conflicts=('grub-legacy' 'grub')
replaces=('grub2-common')
provides=('grub2-common')
[arch-commits] Commit in grub/trunk (PKGBUILD grub.cfg)
Date: Tuesday, January 15, 2013 @ 03:14:18
Author: ronald
Revision: 175140
fix Arch Linux naming FS#33393
Modified:
grub/trunk/PKGBUILD
grub/trunk/grub.cfg
--+
PKGBUILD |2 ++
grub.cfg |4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-01-15 08:05:27 UTC (rev 175139)
+++ PKGBUILD2013-01-15 08:14:18 UTC (rev 175140)
@@ -202,6 +202,8 @@
# remove platform specific files
rm -rf "${pkgdir}/usr/lib/grub/i386-pc/"
+ # Fix OS naming FS#33393
+ sed -i 's|GNU/Linux|Linux|' ${pkgdir}/etc/grub.d/10_linux
}
package_grub-bios() {
Modified: grub.cfg
===
--- grub.cfg2013-01-15 08:05:27 UTC (rev 175139)
+++ grub.cfg2013-01-15 08:14:18 UTC (rev 175140)
@@ -78,7 +78,7 @@
### END /etc/grub.d/00_header ###
### BEGIN /etc/grub.d/10_linux ###
-menuentry 'Arch GNU/Linux, with Linux core repo kernel' --class arch --class
gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-core repo
kernel-true-ad4103fa-d940-47ca-8506-301d8071d467' {
+menuentry 'Arch Linux, with Linux core repo kernel' --class arch --class
gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-core repo
kernel-true-ad4103fa-d940-47ca-8506-301d8071d467' {
load_video
set gfxpayload=keep
insmod gzio
@@ -95,7 +95,7 @@
echo'Loading initial ramdisk ...'
initrd /boot/initramfs-linux.img
}
-menuentry 'Arch GNU/Linux, with Linux core repo kernel (Fallback initramfs)'
--class arch --class gnu-linux --class gnu --class os $menuentry_id_option
'gnulinux-core repo kernel-fallback-ad4103fa-d940-47ca-8506-301d8071d467' {
+menuentry 'Arch Linux, with Linux core repo kernel (Fallback initramfs)'
--class arch --class gnu-linux --class gnu --class os $menuentry_id_option
'gnulinux-core repo kernel-fallback-ad4103fa-d940-47ca-8506-301d8071d467' {
load_video
set gfxpayload=keep
insmod gzio
[arch-commits] Commit in grub/trunk (PKGBUILD)
Date: Thursday, November 3, 2011 @ 17:16:38
Author: ronald
Revision: 141999
sign package
Modified:
grub/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-11-03 21:12:45 UTC (rev 141998)
+++ PKGBUILD2011-11-03 21:16:38 UTC (rev 141999)
@@ -3,7 +3,7 @@
pkgname=grub
pkgver=0.97
-pkgrel=20
+pkgrel=21
pkgdesc="A GNU multiboot boot loader"
arch=('i686' 'x86_64')
license=('GPL')
@@ -39,8 +39,8 @@
'61c4b58d2eaa3c1561d8e9d8fc41341ce8882869')
#set destination architecture here
-DESTARCH="i686"
-#DESTARCH="x86_64"
+#DESTARCH="i686"
+DESTARCH="x86_64"
build() {
[arch-commits] Commit in grub/trunk (PKGBUILD install-grub)
Date: Monday, August 8, 2011 @ 13:30:51
Author: ronald
Revision: 134896
upgpkg: grub 0.97-20
FS#25442 grub-install doesn't work on i686; add xfsprogs to optdepends and add
check for it in install-grub script
Modified:
grub/trunk/PKGBUILD
grub/trunk/install-grub
--+
PKGBUILD | 10 +-
install-grub |8
2 files changed, 9 insertions(+), 9 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-08-08 15:00:20 UTC (rev 134895)
+++ PKGBUILD2011-08-08 17:30:51 UTC (rev 134896)
@@ -3,13 +3,14 @@
pkgname=grub
pkgver=0.97
-pkgrel=19
+pkgrel=20
pkgdesc="A GNU multiboot boot loader"
arch=('i686' 'x86_64')
license=('GPL')
url="http://www.gnu.org/software/grub/";
groups=('base')
depends=('ncurses' 'diffutils' 'sed')
+optdepends=('xfsprogs: freezing of xfs /boot in install-grub script')
source=(ftp://alpha.gnu.org/gnu/grub/grub-$pkgver.tar.gz
menu.lst
install-grub
@@ -26,7 +27,7 @@
install=grub.install
sha1sums=('2580626c4579bd99336d3af4482c346c95dac4fb'
'33d43d48000b2027f9baec8fc99d33e0c4500c96'
- 'e88a68204c9c9d4bd0b50fa11cab789df4ac55f8'
+ '60e8f7e4c113b85165fd5d9cd724e8413a337a12'
'157b81dbad3576536b08642242accfa1aeb093a9'
'adbb4685c98797ffb4dc83561ec75698991dddbd'
'f2e0dff29a7c8a45e90aa07298a1b2a9a9d29afc'
@@ -37,7 +38,6 @@
'a36f34e51efed540f1ddafd78e9c9f6d83e4c8d4'
'61c4b58d2eaa3c1561d8e9d8fc41341ce8882869')
-
#set destination architecture here
DESTARCH="i686"
#DESTARCH="x86_64"
@@ -80,10 +80,10 @@
patch -Np1 -i ../040_all_grub-0.96-nxstack.patch
# patch from frugalware to make it boot when more than 2GB ram installed
patch -Np1 -i ../05-grub-0.97-initrdaddr.diff
- CFLAGS="-static" ./configure --prefix=/usr --bindir=/bin --sbindir=/sbin
\
+ CFLAGS="-static -fno-strict-aliasing" ./configure --prefix=/usr
--bindir=/bin --sbindir=/sbin \
--mandir=/usr/share/man --infodir=/usr/share/info
else
- CFLAGS= ./configure --prefix=/usr --bindir=/bin --sbindir=/sbin \
+ CFLAGS="-fno-strict-aliasing" ./configure --prefix=/usr --bindir=/bin
--sbindir=/sbin \
--mandir=/usr/share/man --infodir=/usr/share/info
fi
fi
Modified: install-grub
===
--- install-grub2011-08-08 15:00:20 UTC (rev 134895)
+++ install-grub2011-08-08 17:30:51 UTC (rev 134896)
@@ -160,8 +160,8 @@
# freeze xfs filesystems to enable grub installation on xfs filesystems
if [ -x /usr/sbin/xfs_freeze ]; then
-/usr/sbin/xfs_freeze -f /boot > /dev/null 2>&1
-/usr/sbin/xfs_freeze -f / > /dev/null 2>&1
+[ "$(stat -fLc %T /boot)" == "xfs" ] && /usr/sbin/xfs_freeze -f /boot >
/dev/null 2>&1
+[ "$(stat -fLc %T /)" == "xfs" ] && /usr/sbin/xfs_freeze -f / > /dev/null
2>&1
fi
# look for a separately-mounted /boot partition
@@ -187,8 +187,8 @@
# unfreeze xfs filesystems
if [ -x /usr/sbin/xfs_freeze ]; then
-/usr/sbin/xfs_freeze -u /boot > /dev/null 2>&1
-/usr/sbin/xfs_freeze -u / > /dev/null 2>&1
+[ "$(stat -fLc %T /boot)" == "xfs" ] && /usr/sbin/xfs_freeze -u /boot >
/dev/null 2>&1
+[ "$(stat -fLc %T /)" == "xfs" ] && /usr/sbin/xfs_freeze -u / > /dev/null
2>&1
fi
if grep "Error [0-9]*: " /tmp/grub.log >/dev/null; then
echo "Error installing GRUB. (see /tmp/grub.log for output)"
[arch-commits] Commit in grub/trunk (PKGBUILD menu.lst)
Date: Sunday, August 7, 2011 @ 08:16:30
Author: ibiru
Revision: 134676
change vmlinuz26 to vmlinuz-linux and kernel26.img to initramfs-linux.img in
menu.lst
Modified:
grub/trunk/PKGBUILD
grub/trunk/menu.lst
--+
PKGBUILD |4 ++--
menu.lst |6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-08-07 11:29:39 UTC (rev 134675)
+++ PKGBUILD2011-08-07 12:16:30 UTC (rev 134676)
@@ -3,7 +3,7 @@
pkgname=grub
pkgver=0.97
-pkgrel=18
+pkgrel=19
pkgdesc="A GNU multiboot boot loader"
arch=('i686' 'x86_64')
license=('GPL')
@@ -25,7 +25,7 @@
backup=('boot/grub/menu.lst')
install=grub.install
sha1sums=('2580626c4579bd99336d3af4482c346c95dac4fb'
- '734fa37ebe1657bf1f8f74ee4866953ff96f2604'
+ '33d43d48000b2027f9baec8fc99d33e0c4500c96'
'e88a68204c9c9d4bd0b50fa11cab789df4ac55f8'
'157b81dbad3576536b08642242accfa1aeb093a9'
'adbb4685c98797ffb4dc83561ec75698991dddbd'
Modified: menu.lst
===
--- menu.lst2011-08-07 11:29:39 UTC (rev 134675)
+++ menu.lst2011-08-07 12:16:30 UTC (rev 134676)
@@ -36,10 +36,10 @@
#-*
# (0) Arch Linux
-title Arch Linux [/boot/vmlinuz26]
+title Arch Linux [/boot/vmlinuz-linux]
root (hd0,0)
-kernel /vmlinuz26 root=/dev/sda3 ro
-initrd /kernel26.img
+kernel /vmlinuz-linux root=/dev/sda3 ro
+initrd /initramfs-linux.img
# (1) Windows
#title Windows
[arch-commits] Commit in grub/trunk (PKGBUILD)
Date: Wednesday, August 3, 2011 @ 15:24:00
Author: ronald
Revision: 134416
upgpkg: grub 0.97-18
fix compile issues; handle new kernel naming scheme in install-grub script;
make install-grub script slightly smarter (though still not very smart)
Modified:
grub/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-08-03 19:21:26 UTC (rev 134415)
+++ PKGBUILD2011-08-03 19:24:00 UTC (rev 134416)
@@ -39,8 +39,8 @@
#set destination architecture here
-#DESTARCH="i686"
-DESTARCH="x86_64"
+DESTARCH="i686"
+#DESTARCH="x86_64"
build() {
[arch-commits] Commit in grub/trunk (PKGBUILD install-grub)
Date: Wednesday, August 3, 2011 @ 15:21:09
Author: ronald
Revision: 134414
upgpkg: grub 0.97-18
fix compile issues; handle new kernel naming scheme in install-grub script;
make install-grub script slightly smarter (though still not very smart)
Modified:
grub/trunk/PKGBUILD
grub/trunk/install-grub
--+
PKGBUILD | 15 +++
install-grub | 12 ++--
2 files changed, 17 insertions(+), 10 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-08-03 18:33:46 UTC (rev 134413)
+++ PKGBUILD2011-08-03 19:21:09 UTC (rev 134414)
@@ -26,7 +26,7 @@
install=grub.install
sha1sums=('2580626c4579bd99336d3af4482c346c95dac4fb'
'734fa37ebe1657bf1f8f74ee4866953ff96f2604'
- '5479f098c71817ac86d0059cf1c77ca169a6fd93'
+ 'e88a68204c9c9d4bd0b50fa11cab789df4ac55f8'
'157b81dbad3576536b08642242accfa1aeb093a9'
'adbb4685c98797ffb4dc83561ec75698991dddbd'
'f2e0dff29a7c8a45e90aa07298a1b2a9a9d29afc'
@@ -37,12 +37,15 @@
'a36f34e51efed540f1ddafd78e9c9f6d83e4c8d4'
'61c4b58d2eaa3c1561d8e9d8fc41341ce8882869')
+
+#set destination architecture here
+#DESTARCH="i686"
+DESTARCH="x86_64"
+
+
build() {
cd $srcdir/$pkgname-$pkgver
- #set destination architecture here
- #DESTARCH="i686"
- DESTARCH="x86_64"
# optimizations break the build -- disable them
# adding special devices to grub, patches are from fedora
patch -Np1 -i ../special-devices.patch
@@ -84,7 +87,11 @@
--mandir=/usr/share/man --infodir=/usr/share/info
fi
fi
+}
+package() {
+ cd $srcdir/$pkgname-$pkgver
+
CFLAGS= make
make DESTDIR=$pkgdir install
install -D -m644 ../menu.lst $pkgdir/boot/grub/menu.lst
Modified: install-grub
===
--- install-grub2011-08-03 18:33:46 UTC (rev 134413)
+++ install-grub2011-08-03 19:21:09 UTC (rev 134414)
@@ -114,15 +114,15 @@
head -n $(cat /tmp/.menu.lst | grep -n '#-\*' | cut -d: -f 1)
/tmp/.menu.lst >/boot/grub/menu.lst
rm -f /tmp/.menu.lst
- for kernel in /boot/vmlinuz-linux* /boot/vmlinuz26*; do
- if [ ${kernel} == "/boot/vmlinuz-linux*" ] || [ ${kernel} ==
"/boot/vmlinuz26*" ] ; then
+ for kernel in /boot/vmlinuz-linux* /boot/vmlinuz26-*; do
+ if [ ${kernel} == "/boot/vmlinuz-linux*" ] || [ ${kernel} ==
"/boot/vmlinuz26-*" ] ; then
echo > /dev/null
else
VMLINUZ=$( echo ${kernel} | cut -c 7- )
- if [ "$( echo ${VMLINUZ} | cut -c -13 )" = vmlinuz-linux ]; then #
new naming scheme for linux > 3.0
+ if [ "$( echo ${VMLINUZ} | cut -c -13 )" = "vmlinuz-linux" ]; then #
new naming scheme for linux > 3.0
extension=$( echo ${VMLINUZ} | cut -c 14- )
- INITRAMFS_BASENAME = initramfs-linux${extension}
+ INITRAMFS_BASENAME=initramfs-linux${extension}
else # old naming scheme for lts kernel
extension=$( echo ${VMLINUZ} | cut -c 10- )
INITRAMFS_BASENAME=kernel26${extension}
@@ -130,7 +130,7 @@
echo "" >>/boot/grub/menu.lst
echo "# (0) Arch Linux" >>/boot/grub/menu.lst
- echo "title Arch Linux" >>/boot/grub/menu.lst
+ echo "title Arch Linux - ${VMLINUZ}" >>/boot/grub/menu.lst
subdir=
if [ "${bootdev}" != "" ]; then
grubdev=$(mapdev ${bootdev})
@@ -144,7 +144,7 @@
# adding fallback/full image
echo "# (1) Arch Linux" >>/boot/grub/menu.lst
- echo "title Arch Linux Fallback" >>/boot/grub/menu.lst
+ echo "title Arch Linux Fallback - ${VMLINUZ}" >>/boot/grub/menu.lst
echo "root ${grubdev}" >>/boot/grub/menu.lst
echo "kernel ${subdir}/${VMLINUZ} root=${PART_ROOT} ro"
>>/boot/grub/menu.lst
echo "initrd ${subdir}/${INITRAMFS_BASENAME}-fallback.img"
>>/boot/grub/menu.lst
[arch-commits] Commit in grub/trunk (PKGBUILD install-grub)
Date: Wednesday, August 3, 2011 @ 14:23:55
Author: ronald
Revision: 134407
compile fixes; handle new naming scheme in install-grub script
Modified:
grub/trunk/PKGBUILD
grub/trunk/install-grub
--+
PKGBUILD | 62 +++-
install-grub | 285 ++---
2 files changed, 189 insertions(+), 158 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-08-03 16:57:15 UTC (rev 134406)
+++ PKGBUILD2011-08-03 18:23:55 UTC (rev 134407)
@@ -3,7 +3,7 @@
pkgname=grub
pkgver=0.97
-pkgrel=17
+pkgrel=18
pkgdesc="A GNU multiboot boot loader"
arch=('i686' 'x86_64')
license=('GPL')
@@ -20,20 +20,22 @@
more-raid.patch
intelmac.patch
grub-inode-size.patch
- ext4.patch)
+ ext4.patch
+ grub-0.97-ldflags-objcopy-remove-build-id.patch)
backup=('boot/grub/menu.lst')
install=grub.install
-md5sums=('cd3f3eb54446be6003156158d51f4884'
- 'a2098dc41fc3cb13e53179de2979d088'
- '3182c4ae4963a16930bc772bba89dacf'
- 'eb9d69c46af3a0667c1f651817d7f075'
- 'ccd2d757e79e3a03dc19ede7391ed328'
- '826fdbf446067f9861baf9f6a69a4583'
- '49f6d4bcced0bc8bbcff273f3254bbfa'
- 'f41f702014a064918d7afc6fc23baa6e'
- '175dc6b9f4ab94e8056c3afb3e34460a'
- '69c648d2b8d0965df70a74014424f31c'
- '39e0f9a05b7e04aceb24fc7bc4893e3d')
+sha1sums=('2580626c4579bd99336d3af4482c346c95dac4fb'
+ '734fa37ebe1657bf1f8f74ee4866953ff96f2604'
+ '5479f098c71817ac86d0059cf1c77ca169a6fd93'
+ '157b81dbad3576536b08642242accfa1aeb093a9'
+ 'adbb4685c98797ffb4dc83561ec75698991dddbd'
+ 'f2e0dff29a7c8a45e90aa07298a1b2a9a9d29afc'
+ 'c5e2c94ed0e759590b9eb38c9d979f075d19d7c0'
+ '45fe668a3779664fb292591f426976b6c784d6c8'
+ '066d7ab1ae442f88e94c9e4f1867ac6682965d06'
+ '0436aa6fa0b6f768289172f983a3f4b69384629e'
+ 'a36f34e51efed540f1ddafd78e9c9f6d83e4c8d4'
+ '61c4b58d2eaa3c1561d8e9d8fc41341ce8882869')
build() {
cd $srcdir/$pkgname-$pkgver
@@ -43,26 +45,38 @@
DESTARCH="x86_64"
# optimizations break the build -- disable them
# adding special devices to grub, patches are from fedora
- patch -Np1 -i ../special-devices.patch || return 1
- patch -Np1 -i ../i2o.patch || return 1
- patch -Np1 -i ../more-raid.patch || return 1
- patch -Np1 -i ../intelmac.patch || return 1
+ patch -Np1 -i ../special-devices.patch
+ patch -Np1 -i ../i2o.patch
+ patch -Np1 -i ../more-raid.patch
+ patch -Np1 -i ../intelmac.patch
# Add support for bigger inode size to e2fs_stage1_5
- patch -Np1 -i ../grub-inode-size.patch || return 1
+ patch -Np1 -i ../grub-inode-size.patch
# Add ext4 support
# http://www.mail-archive.com/bug-grub@gnu.org/msg11458.html
- patch -Np1 -i ../ext4.patch || return 1
+ patch -Np1 -i ../ext4.patch
+ # binutils fix
+ patch -Np1 -i ../grub-0.97-ldflags-objcopy-remove-build-id.patch
+ sed -e'/^AC_PROG_CC/ a\AM_PROG_CC_C_O\ ' -i
"${srcdir}/${pkgname}-${pkgver}/configure.ac"
+ sed -e'/^AC_PROG_CC/ a\AM_PROG_AS\ ' -i
"${srcdir}/${pkgname}-${pkgver}/configure.ac"
+
+ ## recreate ./configure script with the required changes in LDFLAGS and
objcopy
+ aclocal
+ autoconf
+ autoreconf
+ automake
+
#arch64 fixes for static build
- if [ "$CARCH" = "x86_64" ]; then
+ if [ "$CARCH" = "x86_64" ]; then ## correcting problems for new wersion of
autotools
+
echo "this package has to be built on i686, won't compile on x86_64"
sleep 5
else
if [ "$DESTARCH" = "x86_64" ]; then
# patch from gentoo for fixing a segfault
- patch -Np1 -i ../040_all_grub-0.96-nxstack.patch || return 1
+ patch -Np1 -i ../040_all_grub-0.96-nxstack.patch
# patch from frugalware to make it boot when more than 2GB ram installed
- patch -Np1 -i ../05-grub-0.97-initrdaddr.diff || return 1
+ patch -Np1 -i ../05-grub-0.97-initrdaddr.diff
CFLAGS="-static" ./configure --prefix=/usr --bindir=/bin --sbindir=/sbin
\
--mandir=/usr/share/man --infodir=/usr/share/info
else
@@ -71,8 +85,8 @@
fi
fi
- CFLAGS= make || return 1
- make DESTDIR=$pkgdir install || return 1
+ CFLAGS= make
+ make DESTDIR=$pkgdir install
install -D -m644 ../menu.lst $pkgdir/boot/grub/menu.lst
install -D -m755 ../install-grub $pkgdir/sbin/install-grub
Modified: install-grub
===
--- install-grub2011-08-03 16:57:15 UTC (rev 134406)
+++ install-grub2011-08-03 18:23:55 UTC (rev 134407)
@@ -12,8 +12,8 @@
#
# Then start up the 'grub' shell and run something like the following:
#
-#grub> root(hd0,0)
-#grub> setup(hd0)
+#grub> root (hd0,0)
+#grub> setup (hd0)
#
# The "root" line should point to the partition your kernel is located on,
# /boot if you have a
[arch-commits] Commit in grub/trunk (PKGBUILD)
Date: Tuesday, June 15, 2010 @ 01:19:15 Author: allan Revision: 82655 fix $startdir usage Modified: grub/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-06-15 05:17:45 UTC (rev 82654) +++ PKGBUILD2010-06-15 05:19:15 UTC (rev 82655) @@ -73,8 +73,8 @@ CFLAGS= make || return 1 make DESTDIR=$pkgdir install || return 1 - install -D -m644 ../menu.lst $startdir/pkg/boot/grub/menu.lst - install -D -m755 ../install-grub $startdir/pkg/sbin/install-grub + install -D -m644 ../menu.lst $pkgdir/boot/grub/menu.lst + install -D -m755 ../install-grub $pkgdir/sbin/install-grub if [ "$DESTARCH" = "x86_64" ]; then # fool makepkg into building a x86_64 package
[arch-commits] Commit in grub/trunk (PKGBUILD grub.install)
Date: Sunday, April 18, 2010 @ 09:32:16
Author: allan
Revision: 77844
upgpkg: grub 0.97-17
add install-info presence test to install script
Modified:
grub/trunk/PKGBUILD
grub/trunk/grub.install
--+
PKGBUILD |5 +
grub.install | 20 +---
2 files changed, 10 insertions(+), 15 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-04-18 13:08:09 UTC (rev 77843)
+++ PKGBUILD2010-04-18 13:32:16 UTC (rev 77844)
@@ -3,7 +3,7 @@
pkgname=grub
pkgver=0.97
-pkgrel=16
+pkgrel=17
pkgdesc="A GNU multiboot boot loader"
arch=('i686' 'x86_64')
license=('GPL')
@@ -75,9 +75,6 @@
make DESTDIR=$pkgdir install || return 1
install -D -m644 ../menu.lst $startdir/pkg/boot/grub/menu.lst
install -D -m755 ../install-grub $startdir/pkg/sbin/install-grub
-
- rm -f $pkgdir/usr/share/info/dir || return 1
- gzip /$pkgdir/usr/share/info/*
if [ "$DESTARCH" = "x86_64" ]; then
# fool makepkg into building a x86_64 package
Modified: grub.install
===
--- grub.install2010-04-18 13:08:09 UTC (rev 77843)
+++ grub.install2010-04-18 13:32:16 UTC (rev 77844)
@@ -1,22 +1,20 @@
-info_dir=/usr/share/info
-info_files=(grub.info multiboot.info)
+infodir=/usr/share/info
+filelist=(grub.info multiboot.info)
post_install() {
- for f in ${info_fil...@]}; do
-install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${fileli...@]}; do
+install-info $infodir/$file.gz $infodir/dir 2> /dev/null
done
}
post_upgrade() {
-post_install
+ post_install $1
}
pre_remove() {
- for f in ${info_fil...@]}; do
-install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${fileli...@]}; do
+install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
done
}
-
-
-
-
