joborun-pkg/jobcore
joborun-pkg/jobcore
Template
2
1
Fork 0
Code Issues Pull requests Projects Releases Activity

upg grub kbd

Browse source
This commit is contained in:
joborun linux 2023-06-13 10:41:18 +03:00
parent 1c1c796908
commit 4b77af2f21
7 changed files with 54 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
grub/0003-support-dropins-for-default-configuration.patch Normal file
View file

@ -0,0 +1,28 @@
From ac560966d09295663fa9516d8d137e0c0fd04c06 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 12 Jun 2023 07:42:01 +0200
Subject: [PATCH 1/1] support dropins for default configuration
---
util/grub-mkconfig.in | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index 1a945085c..4338dceef 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -160,6 +160,11 @@ fi
if test -f ${sysconfdir}/default/grub ; then
. ${sysconfdir}/default/grub
fi
+for dropin in ${sysconfdir}/default/grub.d/*.cfg ; do
+ if test -f "${dropin}" ; then
+ . "${dropin}"
+ fi
+done
if [ "x${GRUB_DISABLE_UUID}" = "xtrue" ]; then
if [ -z "${GRUB_DISABLE_LINUX_UUID}" ]; then
--
2.41.0

15
grub/PKGBUILD
View file

@ -22,9 +22,9 @@ pkgdesc='GNU GRand Unified Bootloader (2)'
epoch=2 epoch=2
_commit='e67a551a48192a04ab705fca832d82f850162b64' _commit='e67a551a48192a04ab705fca832d82f850162b64'
_pkgver=2.06.r499.ge67a551a4 _pkgver=2.06.r499.ge67a551a4
_unifont_ver='15.0.01' _unifont_ver='15.0.06'
pkgver=${_pkgver/-/} pkgver=${_pkgver/-/}
pkgrel=01 pkgrel=02
url='https://www.gnu.org/software/grub/' url='https://www.gnu.org/software/grub/'
backup=('etc/default/grub' backup=('etc/default/grub'
'etc/grub.d/40_custom') 'etc/grub.d/40_custom')
@ -58,6 +58,7 @@ source=("git+https://git.savannah.gnu.org/git/grub.git#commit=${_commit}"
"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}
'0001-00_header-add-GRUB_COLOR_-variables.patch' '0001-00_header-add-GRUB_COLOR_-variables.patch'
'0002-10_linux-detect-archlinux-initramfs.patch' '0002-10_linux-detect-archlinux-initramfs.patch'
'0003-support-dropins-for-default-configuration.patch'
'grub.default' 'grub.default'
'grub.default.run' 'grub.default.run'
'grub.default.66' 'grub.default.66'
@ -117,6 +118,9 @@ prepare() {
echo "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}/0002-10_linux-detect-archlinux-initramfs.patch" patch -Np1 -i "${srcdir}/0002-10_linux-detect-archlinux-initramfs.patch"
echo "Patch to support dropins for default configuration..."
patch -Np1 -i "${srcdir}/0003-support-dropins-for-default-configuration.patch"
echo "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" sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "configure.ac"
@ -322,13 +326,14 @@ validpgpkeys=('E53D497F3FA42AD8C9B4D1E835A93B74E82E4209' # Vladimir 'phcoder' S
sha256sums=(SKIP sha256sums=(SKIP
SKIP SKIP
1fddba900a36b8a067bf2177b05c4a2482a0f7ca1545cf531c03509f47ce1590 # unifont-15.0.01.bdf.gz 93cb54fa103a00e25cd3e16550b4b4eb13cbd098e515679ade3ae82cd0739f29 # unifont-15.0.06.bdf.gz
7d2bfe94e8365d4178b849d6c12c40794e7af84ed6eebd878ac480f547fd38d0 # unifont-15.0.01.bdf.gz.sig d968cdf6eefdc2fd6f17515e559a76f513d5edec4e9a495b935d0f285cb69bc8 # unifont-15.0.06.bdf.gz.sig
5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab # 0001-00_header-add-GRUB_COLOR_-variables.patch 5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab # 0001-00_header-add-GRUB_COLOR_-variables.patch
8488aec30a93e8fe66c23ef8c23aefda39c38389530e9e73ba3fbcc8315d244d # 0002-10_linux-detect-archlinux-initramfs.patch 8488aec30a93e8fe66c23ef8c23aefda39c38389530e9e73ba3fbcc8315d244d # 0002-10_linux-detect-archlinux-initramfs.patch
b5d9fcd62ffb3c3950fdeb7089ec2dc2294ac52e9861980ad90a437dedbd3d47 # 0003-support-dropins-for-default-configuration.patch
83f99850b6c751d0a7bd3e6b9f1808a0c05962cdd1cd8f57cbbd63f1a3379c96 # grub.default 83f99850b6c751d0a7bd3e6b9f1808a0c05962cdd1cd8f57cbbd63f1a3379c96 # grub.default
83f99850b6c751d0a7bd3e6b9f1808a0c05962cdd1cd8f57cbbd63f1a3379c96 # grub.default.run 83f99850b6c751d0a7bd3e6b9f1808a0c05962cdd1cd8f57cbbd63f1a3379c96 # grub.default.run
adad61d98de32e241a1cf55a166699de449533fa16e15e97a326515f80639ef7 # grub.default.66 adad61d98de32e241a1cf55a166699de449533fa16e15e97a326515f80639ef7 # grub.default.66
98b23d41e223bdc0a6e20bdcb3aa77e642f29b64081b1fd2f575314172fc89df) # sbat.csv 98b23d41e223bdc0a6e20bdcb3aa77e642f29b64081b1fd2f575314172fc89df) # sbat.csv
## 3ae2d4139ced74f8b4c1a12b5e652758a02626cd5ff166fb86427a254b104a5a grub-2:2.06.r499.ge67a551a4-01-x86_64.pkg.tar.lz ## fe6534572f9c4714ec7397b5f91306baec07e16e81e5d53b9a2f5f353a02376e grub-2:2.06.r499.ge67a551a4-02-x86_64.pkg.tar.lz

11
grub/PKGBUILD-arch
View file

@ -20,9 +20,9 @@ pkgdesc='GNU GRand Unified Bootloader (2)'
epoch=2 epoch=2
_commit='e67a551a48192a04ab705fca832d82f850162b64' _commit='e67a551a48192a04ab705fca832d82f850162b64'
_pkgver=2.06.r499.ge67a551a4 _pkgver=2.06.r499.ge67a551a4
_unifont_ver='15.0.01' _unifont_ver='15.0.06'
pkgver=${_pkgver/-/} pkgver=${_pkgver/-/}
pkgrel=1 pkgrel=2
url='https://www.gnu.org/software/grub/' url='https://www.gnu.org/software/grub/'
arch=('x86_64') arch=('x86_64')
license=('GPL3') license=('GPL3')
@ -62,15 +62,17 @@ source=("git+https://git.savannah.gnu.org/git/grub.git#commit=${_commit}"
"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}
'0001-00_header-add-GRUB_COLOR_-variables.patch' '0001-00_header-add-GRUB_COLOR_-variables.patch'
'0002-10_linux-detect-archlinux-initramfs.patch' '0002-10_linux-detect-archlinux-initramfs.patch'
'0003-support-dropins-for-default-configuration.patch'
'grub.default' 'grub.default'
'sbat.csv') 'sbat.csv')
sha256sums=('SKIP' sha256sums=('SKIP'
'SKIP' 'SKIP'
'1fddba900a36b8a067bf2177b05c4a2482a0f7ca1545cf531c03509f47ce1590' '93cb54fa103a00e25cd3e16550b4b4eb13cbd098e515679ade3ae82cd0739f29'
'SKIP' 'SKIP'
'5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab' '5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab'
'8488aec30a93e8fe66c23ef8c23aefda39c38389530e9e73ba3fbcc8315d244d' '8488aec30a93e8fe66c23ef8c23aefda39c38389530e9e73ba3fbcc8315d244d'
'b5d9fcd62ffb3c3950fdeb7089ec2dc2294ac52e9861980ad90a437dedbd3d47'
'7df3f5cb5df7d2dfb17f4c9b5c5dedc9519ddce6f8d2c6cd43d1be17cecb65cb' '7df3f5cb5df7d2dfb17f4c9b5c5dedc9519ddce6f8d2c6cd43d1be17cecb65cb'
'98b23d41e223bdc0a6e20bdcb3aa77e642f29b64081b1fd2f575314172fc89df') '98b23d41e223bdc0a6e20bdcb3aa77e642f29b64081b1fd2f575314172fc89df')
@ -127,6 +129,9 @@ prepare() {
echo "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}/0002-10_linux-detect-archlinux-initramfs.patch" patch -Np1 -i "${srcdir}/0002-10_linux-detect-archlinux-initramfs.patch"
echo "Patch to support dropins for default configuration..."
patch -Np1 -i "${srcdir}/0003-support-dropins-for-default-configuration.patch"
echo "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" sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "configure.ac"

10
kbd/PKGBUILD
View file

@ -6,8 +6,8 @@
#-----------------------------------------| DESCRIPTION |--------------------------------------- #-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=kbd pkgname=kbd
pkgver=2.5.1 pkgver=2.6.0
pkgrel=02 pkgrel=01
pkgdesc="Keytable files and keyboard utilities" pkgdesc="Keytable files and keyboard utilities"
url="http://www.kbd-project.org" url="http://www.kbd-project.org"
depends=('glibc' 'pam') depends=('glibc' 'pam')
@ -67,9 +67,9 @@ license=('GPL')
validpgpkeys=('7F2A3D07298149A0793C9A4EA45ABA544CFFD434') # Alexey Gladkov validpgpkeys=('7F2A3D07298149A0793C9A4EA45ABA544CFFD434') # Alexey Gladkov
sha256sums=(b3db018458ea7a19c54de9c5680532bd9c3c836d45fefbd20e7e8a49b8e81b1b # kbd-2.5.1.tar.gz sha256sums=(4642d236cb377a8cbfd4157aac25e4b783c99b22ed1d7c0bcb3161d358deaa97 # kbd-2.6.0.tar.gz
34031727a51396b2b37ffa1e318821940e10afdee48cc8fc635831f90405f217 # kbd-2.5.1.tar.sign 03d614155ce1238d7ffba29e4ae561831d5f106cc281b605d65a41d49d20e0f4 # kbd-2.6.0.tar.sign
a5e0167b6a82a9eb4d581d56baab930c2d80f5541dc34630460b73e1115384b8 # fix-euro2.patch a5e0167b6a82a9eb4d581d56baab930c2d80f5541dc34630460b73e1115384b8 # fix-euro2.patch
5c2d377a87121e7c399534fb91e2ffc0cc1e75d44a8f07ee6f55c9c089bc81e4) # vlock.pam 5c2d377a87121e7c399534fb91e2ffc0cc1e75d44a8f07ee6f55c9c089bc81e4) # vlock.pam
## 29ba95ce1e671822beb5d470afea3eb05b8fb747f97dd2b1ef3a067d9bdfd3c8 kbd-2.5.1-02-x86_64.pkg.tar.lz ## 7df8c9f18e4c7fc68c6f44832776dea617790bcbd68f54faa2981f8f27801489 kbd-2.6.0-01-x86_64.pkg.tar.lz

4
kbd/PKGBUILD-arch
View file

@ -1,8 +1,8 @@
# Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=kbd pkgname=kbd
pkgver=2.5.1 pkgver=2.6.0
pkgrel=2 pkgrel=1
pkgdesc="Keytable files and keyboard utilities" pkgdesc="Keytable files and keyboard utilities"
arch=('x86_64') arch=('x86_64')
url="http://www.kbd-project.org" url="http://www.kbd-project.org"

1
util-linux/.gitignore vendored
View file

@ -1,4 +1,3 @@
/PKGBUILD /PKGBUILD
/PKGBUILD-arch /PKGBUILD-arch
/PKGBUILD-oba /PKGBUILD-oba
/NOTE

1
util-linux/NOTE Normal file
View file

@ -0,0 +1 @@
see work done in core2do with alt source and patches