upg grub tzdata
This commit is contained in:
parent
9a1b4b5b64
commit
42d2950ee6
8 changed files with 329 additions and 245 deletions
|
|
@ -20,11 +20,11 @@ _GRUB_EMU_BUILD="0"
|
|||
pkgname='grub'
|
||||
pkgdesc='GNU GRand Unified Bootloader (2)'
|
||||
epoch=2
|
||||
_tag='03e6ea18f6f834f177cad017279bedbb0a3de594' # git rev-parse grub-${_pkgver}
|
||||
#_tag='03e6ea18f6f834f177cad017279bedbb0a3de594' # git rev-parse grub-${_pkgver}
|
||||
_pkgver=2.12
|
||||
_unifont_ver='15.1.05'
|
||||
_unifont_ver='16.0.01'
|
||||
pkgver=${_pkgver/-/}
|
||||
pkgrel=02
|
||||
pkgrel=03
|
||||
url='https://www.gnu.org/software/grub/'
|
||||
backup=('etc/default/grub'
|
||||
'etc/grub.d/40_custom')
|
||||
|
|
@ -123,8 +123,9 @@ prepare() {
|
|||
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"
|
||||
|
||||
echo "Fix mkinitcpio 'rw' FS#36275..."
|
||||
sed 's| ro | rw |g' -i "util/grub.d/10_linux.in"
|
||||
echo "Fix mkinitcpio 'ro' "
|
||||
# sed 's| ro | rw |g' -i "util/grub.d/10_linux.in"
|
||||
sed 's| rw | ro |g' -i "util/grub.d/10_linux.in"
|
||||
|
||||
echo "Fix OS naming FS#33393..."
|
||||
sed 's|GNU/Linux|Linux|' -i "util/grub.d/10_linux.in"
|
||||
|
|
@ -323,16 +324,18 @@ validpgpkeys=('E53D497F3FA42AD8C9B4D1E835A93B74E82E4209' # Vladimir 'phcoder' S
|
|||
'BE5C23209ACDDACEB20DB0A28C8189F1988C2166' # Daniel Kiper <dkiper@net-space.pl>
|
||||
'95D2E9AB8740D8046387FD151A09227B1F435A33') # Paul Hardy <unifoundry@unifoundry.com>
|
||||
|
||||
sha256sums=(SKIP
|
||||
sha256sums=(304d5c0d506d3aaab496bdcbfc325b89fc83348aeb9e69d7b6a928f4051bedb2
|
||||
SKIP
|
||||
8ea5b5a14d71e3353d1fea373f5d88d198ad1e285cedd8294655926ee11fd91d # unifont-15.1.05.bdf.gz
|
||||
7f265e7914f12fda6cfffb4fd8c1b7fba2d79b47b508287cb97d0ee87a688c53 # unifont-15.1.05.bdf.gz.sig
|
||||
230a0959aa50778b68239c88ad3c2d53abde58be0932b14a379a3869118aca33
|
||||
SKIP
|
||||
5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab # unifont-16.0.01.bdf.gz
|
||||
8488aec30a93e8fe66c23ef8c23aefda39c38389530e9e73ba3fbcc8315d244d # unifont-16.0.01.bdf.gz.sig
|
||||
5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab # 0001-00_header-add-GRUB_COLOR_-variables.patch
|
||||
8488aec30a93e8fe66c23ef8c23aefda39c38389530e9e73ba3fbcc8315d244d # 0002-10_linux-detect-archlinux-initramfs.patch
|
||||
b5d9fcd62ffb3c3950fdeb7089ec2dc2294ac52e9861980ad90a437dedbd3d47 # 0003-support-dropins-for-default-configuration.patch
|
||||
83f99850b6c751d0a7bd3e6b9f1808a0c05962cdd1cd8f57cbbd63f1a3379c96 # grub.default
|
||||
83f99850b6c751d0a7bd3e6b9f1808a0c05962cdd1cd8f57cbbd63f1a3379c96 # grub.default.run
|
||||
adad61d98de32e241a1cf55a166699de449533fa16e15e97a326515f80639ef7 # grub.default.66
|
||||
75b437e485ba3e389713987fecf6d045680ab93231025405b7083b78e856e063 # grub.default
|
||||
75b437e485ba3e389713987fecf6d045680ab93231025405b7083b78e856e063 # grub.default.run
|
||||
a150754e5ba4ce37193c1331858f443a1c6644be74563ef835f75ea55859b5e8 # grub.default.66
|
||||
f34c2b0aa2ed4ab9c7e7bcab5197470c30fedc6c2148f337839dd24bceae35fd) # sbat.csv
|
||||
|
||||
# Note to packager:
|
||||
|
|
@ -340,4 +343,5 @@ sha256sums=(SKIP
|
|||
#echo "you must rename this package to meet SF naming before you move to the repo"
|
||||
#mv $(ls -l $pkgname*pkg.tar.lz) $pkgname-$epoch_$pkgver-$pkgrel-$arch.pkg.tar.lz >pkg-mv.log
|
||||
|
||||
## 25fbfff5668f414b1dd269fbbdefaab764634fd8a4b6070817c630025aa8a4ad grub-2_2.12-02-x86_64.pkg.tar.lz
|
||||
## e596caf25087b4a281545e8d55e7193083c02f555c4232e90ec22f5d7d3d754c grub-2_2.12-03-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -19,61 +19,103 @@ pkgname='grub'
|
|||
pkgdesc='GNU GRand Unified Bootloader (2)'
|
||||
epoch=2
|
||||
_pkgver=2.12
|
||||
_unifont_ver='15.1.05'
|
||||
_unifont_ver='16.0.01'
|
||||
pkgver=${_pkgver/-/}
|
||||
pkgrel=2
|
||||
pkgrel=3
|
||||
url='https://www.gnu.org/software/grub/'
|
||||
arch=('x86_64')
|
||||
license=('GPL-3.0-or-later')
|
||||
backup=('etc/default/grub'
|
||||
'etc/grub.d/40_custom')
|
||||
backup=(
|
||||
etc/default/grub
|
||||
etc/grub.d/40_custom
|
||||
)
|
||||
install="${pkgname}.install"
|
||||
options=('!makeflags')
|
||||
|
||||
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' 'fuse3')
|
||||
depends=('sh' 'xz' 'gettext' 'device-mapper')
|
||||
optdepends=('freetype2: For grub-mkfont usage'
|
||||
'fuse3: For grub-mount usage'
|
||||
'dosfstools: For grub-mkrescue FAT FS and EFI support'
|
||||
'lzop: For grub-mkrescue LZO 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')
|
||||
conflicts=(
|
||||
grub-bios
|
||||
grub-common
|
||||
grub-efi-${_EFI_ARCH}
|
||||
grub-emu
|
||||
grub-legacy
|
||||
)
|
||||
replaces=(
|
||||
grub-common
|
||||
grub-bios
|
||||
grub-emu
|
||||
grub-efi-${_EFI_ARCH}
|
||||
)
|
||||
provides=(
|
||||
grub-bios
|
||||
grub-common
|
||||
grub-efi-${_EFI_ARCH}
|
||||
grub-emu
|
||||
)
|
||||
makedepends=(
|
||||
autogen
|
||||
device-mapper
|
||||
freetype2
|
||||
fuse3
|
||||
gettext
|
||||
git
|
||||
help2man
|
||||
python
|
||||
rsync
|
||||
texinfo
|
||||
ttf-dejavu
|
||||
xz
|
||||
)
|
||||
depends=(
|
||||
device-mapper
|
||||
gettext
|
||||
sh
|
||||
xz
|
||||
)
|
||||
optdepends=(
|
||||
'dosfstools: For grub-mkrescue FAT FS and EFI support'
|
||||
'efibootmgr: For grub-install EFI support'
|
||||
'freetype2: For grub-mkfont usage'
|
||||
'fuse3: For grub-mount usage'
|
||||
'libisoburn: Provides xorriso for generating grub rescue iso using grub-mkrescue'
|
||||
'lzop: For grub-mkrescue LZO support'
|
||||
'mtools: For grub-mkrescue FAT FS support'
|
||||
'os-prober: To detect other OSes when generating grub.cfg in BIOS systems'
|
||||
)
|
||||
|
||||
if [[ "${_GRUB_EMU_BUILD}" == "1" ]]; then
|
||||
makedepends+=('libusbx' 'sdl')
|
||||
optdepends+=('libusbx: For grub-emu USB support'
|
||||
'sdl: For grub-emu SDL support')
|
||||
makedepends+=(
|
||||
libusbx
|
||||
sdl
|
||||
)
|
||||
optdepends+=(
|
||||
'libusbx: For grub-emu USB support'
|
||||
'sdl: For grub-emu SDL support'
|
||||
)
|
||||
fi
|
||||
|
||||
validpgpkeys=('E53D497F3FA42AD8C9B4D1E835A93B74E82E4209' # Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
|
||||
'BE5C23209ACDDACEB20DB0A28C8189F1988C2166' # Daniel Kiper <dkiper@net-space.pl>
|
||||
'95D2E9AB8740D8046387FD151A09227B1F435A33') # Paul Hardy <unifoundry@unifoundry.com>
|
||||
validpgpkeys=(
|
||||
'E53D497F3FA42AD8C9B4D1E835A93B74E82E4209' # Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
|
||||
'BE5C23209ACDDACEB20DB0A28C8189F1988C2166' # Daniel Kiper <dkiper@net-space.pl>
|
||||
'95D2E9AB8740D8046387FD151A09227B1F435A33') # Paul Hardy <unifoundry@unifoundry.com>
|
||||
|
||||
source=("git+https://git.savannah.gnu.org/git/grub.git#tag=grub-${_pkgver}?signed"
|
||||
'git+https://git.savannah.gnu.org/git/gnulib.git'
|
||||
"https://ftp.gnu.org/gnu/unifont/unifont-${_unifont_ver}/unifont-${_unifont_ver}.bdf.gz"{,.sig}
|
||||
'0001-00_header-add-GRUB_COLOR_-variables.patch'
|
||||
'0002-10_linux-detect-archlinux-initramfs.patch'
|
||||
'0003-support-dropins-for-default-configuration.patch'
|
||||
'grub.default'
|
||||
'sbat.csv')
|
||||
|
||||
sha256sums=('SKIP'
|
||||
'SKIP'
|
||||
'8ea5b5a14d71e3353d1fea373f5d88d198ad1e285cedd8294655926ee11fd91d'
|
||||
'SKIP'
|
||||
'5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab'
|
||||
'8488aec30a93e8fe66c23ef8c23aefda39c38389530e9e73ba3fbcc8315d244d'
|
||||
'b5d9fcd62ffb3c3950fdeb7089ec2dc2294ac52e9861980ad90a437dedbd3d47'
|
||||
'7df3f5cb5df7d2dfb17f4c9b5c5dedc9519ddce6f8d2c6cd43d1be17cecb65cb'
|
||||
'f34c2b0aa2ed4ab9c7e7bcab5197470c30fedc6c2148f337839dd24bceae35fd')
|
||||
source=(
|
||||
"git+https://git.savannah.gnu.org/git/grub.git#tag=grub-${_pkgver}?signed"
|
||||
'git+https://git.savannah.gnu.org/git/gnulib.git'
|
||||
"https://ftp.gnu.org/gnu/unifont/unifont-${_unifont_ver}/unifont-${_unifont_ver}.bdf.gz"{,.sig}
|
||||
'0001-00_header-add-GRUB_COLOR_-variables.patch'
|
||||
'0002-10_linux-detect-archlinux-initramfs.patch'
|
||||
'0003-support-dropins-for-default-configuration.patch'
|
||||
'grub.default'
|
||||
'sbat.csv'
|
||||
)
|
||||
b2sums=('a6cec7271c3ea54a99f02ee6bc0a5825c8be657af68ba9a32b39a5fe8bcb571fb1ba39210426f6bf6a48d913e6e00df37dc2123ea1b39330f4c47bd9dbac9ae3'
|
||||
'SKIP'
|
||||
'9f306564a63961f3a9f7a45f3f3363b1cc44a1651c3fb858ca4e87cdad79668f9aaa4b2989f91032cd614e37a98e5ca5eda2e2b0315d99deab6d0732b6f57a0d'
|
||||
'SKIP'
|
||||
'992c71790785304c28fbaf0dba21dab3e283b199509f0e7e1aa0df08126da75e15b6626c3638279ff2ecaa59b925096d7dbd67d6a53cebd0ce4326ff3719d25b'
|
||||
'b4cd9ac976a579eca19d54c0b31c8d6324525fe5a0b9f5405deb63845367ac1adaa80ece4c166dfd5304608c41aa44b4f64efe235c03f437523b993be06e06e3'
|
||||
'a7820bfe9bddc34af49de63222b3d2a9788367083e29db13b33120269adbfa1619ac421d8597f662f756592889f5cc5538544a17d9936d1420bd5742282c710c'
|
||||
'5e42db2161e8f594b82005b26e590a20a0e8d32b01119bdd7b1a7f7c4b0f3360e8730a3ecdd5912a4dc7af5bd9aed1c3e780965ad6747d831b470158da19388d'
|
||||
'052b55f53ec82d805f952afcd485bfc21623e0e427fc449f29208fecf5c321b9503d33e9025fef34ef3211b60043acfe5db08b057baaf72542a1c48cdc89b3c2')
|
||||
|
||||
_backports=(
|
||||
)
|
||||
|
|
@ -82,242 +124,242 @@ _reverts=(
|
|||
)
|
||||
|
||||
_configure_options=(
|
||||
PACKAGE_VERSION="${epoch}:${pkgver}-${pkgrel}"
|
||||
FREETYPE="pkg-config freetype2"
|
||||
BUILD_FREETYPE="pkg-config freetype2"
|
||||
--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
|
||||
PACKAGE_VERSION="${epoch}:${pkgver}-${pkgrel}"
|
||||
FREETYPE="pkg-config freetype2"
|
||||
BUILD_FREETYPE="pkg-config freetype2"
|
||||
--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/"
|
||||
cd "${srcdir}/grub/"
|
||||
|
||||
echo "Apply backports..."
|
||||
local _c
|
||||
for _c in "${_backports[@]}"; do
|
||||
git log --oneline -1 "${_c}"
|
||||
git cherry-pick -n "${_c}"
|
||||
done
|
||||
echo "Apply backports..."
|
||||
local _c
|
||||
for _c in "${_backports[@]}"; do
|
||||
git log --oneline -1 "${_c}"
|
||||
git cherry-pick -n "${_c}"
|
||||
done
|
||||
|
||||
echo "Apply reverts..."
|
||||
local _c
|
||||
for _c in "${_reverts[@]}"; do
|
||||
git log --oneline -1 "${_c}"
|
||||
git revert -n "${_c}"
|
||||
done
|
||||
echo "Apply reverts..."
|
||||
local _c
|
||||
for _c in "${_reverts[@]}"; do
|
||||
git log --oneline -1 "${_c}"
|
||||
git revert -n "${_c}"
|
||||
done
|
||||
|
||||
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}/0001-00_header-add-GRUB_COLOR_-variables.patch"
|
||||
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}/0001-00_header-add-GRUB_COLOR_-variables.patch"
|
||||
|
||||
echo "Patch to detect of Arch Linux initramfs images by grub-mkconfig..."
|
||||
patch -Np1 -i "${srcdir}/0002-10_linux-detect-archlinux-initramfs.patch"
|
||||
echo "Patch to detect of Arch Linux initramfs images by grub-mkconfig..."
|
||||
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 "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..."
|
||||
sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "configure.ac"
|
||||
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"
|
||||
|
||||
echo "Fix mkinitcpio 'rw' FS#36275..."
|
||||
sed 's| ro | rw |g' -i "util/grub.d/10_linux.in"
|
||||
echo "Fix mkinitcpio 'rw' FS#36275..."
|
||||
sed 's| ro | rw |g' -i "util/grub.d/10_linux.in"
|
||||
|
||||
echo "Fix OS naming FS#33393..."
|
||||
sed 's|GNU/Linux|Linux|' -i "util/grub.d/10_linux.in"
|
||||
echo "Fix OS naming FS#33393..."
|
||||
sed 's|GNU/Linux|Linux|' -i "util/grub.d/10_linux.in"
|
||||
|
||||
echo "Pull in latest language files..."
|
||||
./linguas.sh
|
||||
echo "Pull in latest language files..."
|
||||
./linguas.sh
|
||||
|
||||
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"
|
||||
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"
|
||||
|
||||
echo "Run bootstrap..."
|
||||
./bootstrap \
|
||||
--gnulib-srcdir="${srcdir}/gnulib/" \
|
||||
--no-git
|
||||
echo "Run bootstrap..."
|
||||
./bootstrap \
|
||||
--gnulib-srcdir="${srcdir}/gnulib/" \
|
||||
--no-git
|
||||
|
||||
echo "Make translations reproducible..."
|
||||
sed -i '1i /^PO-Revision-Date:/ d' po/*.sed
|
||||
echo "Make translations reproducible..."
|
||||
sed -i '1i /^PO-Revision-Date:/ d' po/*.sed
|
||||
}
|
||||
|
||||
_build_grub-common_and_bios() {
|
||||
echo "Set ARCH dependent variables for bios build..."
|
||||
if [[ "${CARCH}" == 'x86_64' ]]; then
|
||||
_EFIEMU="--enable-efiemu"
|
||||
else
|
||||
_EFIEMU="--disable-efiemu"
|
||||
fi
|
||||
echo "Set ARCH dependent variables for bios build..."
|
||||
if [[ "${CARCH}" == 'x86_64' ]]; then
|
||||
_EFIEMU="--enable-efiemu"
|
||||
else
|
||||
_EFIEMU="--disable-efiemu"
|
||||
fi
|
||||
|
||||
echo "Copy the source for building the bios part..."
|
||||
cp -r "${srcdir}/grub/" "${srcdir}/grub-bios/"
|
||||
cd "${srcdir}/grub-bios/"
|
||||
echo "Copy the source for building the bios part..."
|
||||
cp -r "${srcdir}/grub/" "${srcdir}/grub-bios/"
|
||||
cd "${srcdir}/grub-bios/"
|
||||
|
||||
echo "Unset all compiler FLAGS for bios build..."
|
||||
unset CFLAGS
|
||||
unset CPPFLAGS
|
||||
unset CXXFLAGS
|
||||
unset LDFLAGS
|
||||
unset MAKEFLAGS
|
||||
echo "Unset all compiler FLAGS for bios build..."
|
||||
unset CFLAGS
|
||||
unset CPPFLAGS
|
||||
unset CXXFLAGS
|
||||
unset LDFLAGS
|
||||
unset MAKEFLAGS
|
||||
|
||||
echo "Run ./configure for bios build..."
|
||||
./configure \
|
||||
--with-platform="pc" \
|
||||
--target="i386" \
|
||||
"${_EFIEMU}" \
|
||||
--enable-boot-time \
|
||||
"${_configure_options[@]}"
|
||||
echo "Run ./configure for bios build..."
|
||||
./configure \
|
||||
--with-platform="pc" \
|
||||
--target="i386" \
|
||||
"${_EFIEMU}" \
|
||||
--enable-boot-time \
|
||||
"${_configure_options[@]}"
|
||||
|
||||
if [ ! -z "${SOURCE_DATE_EPOCH}" ]; then
|
||||
echo "Make info pages reproducible..."
|
||||
touch -d "@${SOURCE_DATE_EPOCH}" $(find -name '*.texi')
|
||||
fi
|
||||
if [ ! -z "${SOURCE_DATE_EPOCH}" ]; then
|
||||
echo "Make info pages reproducible..."
|
||||
touch -d "@${SOURCE_DATE_EPOCH}" $(find -name '*.texi')
|
||||
fi
|
||||
|
||||
echo "Run make for bios build..."
|
||||
make
|
||||
echo "Run make for bios build..."
|
||||
make
|
||||
}
|
||||
|
||||
_build_grub-efi() {
|
||||
echo "Copy the source for building the ${_EFI_ARCH} efi part..."
|
||||
cp -r "${srcdir}/grub/" "${srcdir}/grub-efi-${_EFI_ARCH}/"
|
||||
cd "${srcdir}/grub-efi-${_EFI_ARCH}/"
|
||||
echo "Copy the source for building the ${_EFI_ARCH} efi part..."
|
||||
cp -r "${srcdir}/grub/" "${srcdir}/grub-efi-${_EFI_ARCH}/"
|
||||
cd "${srcdir}/grub-efi-${_EFI_ARCH}/"
|
||||
|
||||
echo "Unset all compiler FLAGS for ${_EFI_ARCH} efi build..."
|
||||
unset CFLAGS
|
||||
unset CPPFLAGS
|
||||
unset CXXFLAGS
|
||||
unset LDFLAGS
|
||||
unset MAKEFLAGS
|
||||
echo "Unset all compiler FLAGS for ${_EFI_ARCH} efi build..."
|
||||
unset CFLAGS
|
||||
unset CPPFLAGS
|
||||
unset CXXFLAGS
|
||||
unset LDFLAGS
|
||||
unset MAKEFLAGS
|
||||
|
||||
echo "Run ./configure for ${_EFI_ARCH} efi build..."
|
||||
./configure \
|
||||
--with-platform="efi" \
|
||||
--target="${_EFI_ARCH}" \
|
||||
--disable-efiemu \
|
||||
--enable-boot-time \
|
||||
"${_configure_options[@]}"
|
||||
echo "Run ./configure for ${_EFI_ARCH} efi build..."
|
||||
./configure \
|
||||
--with-platform="efi" \
|
||||
--target="${_EFI_ARCH}" \
|
||||
--disable-efiemu \
|
||||
--enable-boot-time \
|
||||
"${_configure_options[@]}"
|
||||
|
||||
echo "Run make for ${_EFI_ARCH} efi build..."
|
||||
make
|
||||
echo "Run make for ${_EFI_ARCH} efi build..."
|
||||
make
|
||||
}
|
||||
|
||||
_build_grub-emu() {
|
||||
echo "Copy the source for building the emu part..."
|
||||
cp -r "${srcdir}/grub/" "${srcdir}/grub-emu/"
|
||||
cd "${srcdir}/grub-emu/"
|
||||
echo "Copy the source for building the emu part..."
|
||||
cp -r "${srcdir}/grub/" "${srcdir}/grub-emu/"
|
||||
cd "${srcdir}/grub-emu/"
|
||||
|
||||
echo "Unset all compiler FLAGS for emu build..."
|
||||
unset CFLAGS
|
||||
unset CPPFLAGS
|
||||
unset CXXFLAGS
|
||||
unset LDFLAGS
|
||||
unset MAKEFLAGS
|
||||
echo "Unset all compiler FLAGS for emu build..."
|
||||
unset CFLAGS
|
||||
unset CPPFLAGS
|
||||
unset CXXFLAGS
|
||||
unset LDFLAGS
|
||||
unset MAKEFLAGS
|
||||
|
||||
echo "Run ./configure for emu build..."
|
||||
./configure \
|
||||
--with-platform="emu" \
|
||||
--target="${_EMU_ARCH}" \
|
||||
--enable-grub-emu-usb=no \
|
||||
--enable-grub-emu-sdl=no \
|
||||
--disable-grub-emu-pci \
|
||||
"${_configure_options[@]}"
|
||||
echo "Run ./configure for emu build..."
|
||||
./configure \
|
||||
--with-platform="emu" \
|
||||
--target="${_EMU_ARCH}" \
|
||||
--enable-grub-emu-usb=no \
|
||||
--enable-grub-emu-sdl=no \
|
||||
--disable-grub-emu-pci \
|
||||
"${_configure_options[@]}"
|
||||
|
||||
echo "Run make for emu build..."
|
||||
make
|
||||
echo "Run make for emu build..."
|
||||
make
|
||||
}
|
||||
|
||||
build() {
|
||||
cd "${srcdir}/grub/"
|
||||
cd "${srcdir}/grub/"
|
||||
|
||||
echo "Build grub bios stuff..."
|
||||
_build_grub-common_and_bios
|
||||
echo "Build grub bios stuff..."
|
||||
_build_grub-common_and_bios
|
||||
|
||||
echo "Build grub ${_EFI_ARCH} efi stuff..."
|
||||
_build_grub-efi
|
||||
echo "Build grub ${_EFI_ARCH} efi stuff..."
|
||||
_build_grub-efi
|
||||
|
||||
if [[ "${CARCH}" == "x86_64" ]] && [[ "${_IA32_EFI_IN_ARCH_X64}" == "1" ]]; then
|
||||
echo "Build grub i386 efi stuff..."
|
||||
_EFI_ARCH="i386" _build_grub-efi
|
||||
fi
|
||||
if [[ "${CARCH}" == "x86_64" ]] && [[ "${_IA32_EFI_IN_ARCH_X64}" == "1" ]]; then
|
||||
echo "Build grub i386 efi stuff..."
|
||||
_EFI_ARCH="i386" _build_grub-efi
|
||||
fi
|
||||
|
||||
if [[ "${_GRUB_EMU_BUILD}" == "1" ]]; then
|
||||
echo "Build grub emu stuff..."
|
||||
_build_grub-emu
|
||||
fi
|
||||
if [[ "${_GRUB_EMU_BUILD}" == "1" ]]; then
|
||||
echo "Build grub emu stuff..."
|
||||
_build_grub-emu
|
||||
fi
|
||||
}
|
||||
|
||||
_package_grub-common_and_bios() {
|
||||
cd "${srcdir}/grub-bios/"
|
||||
cd "${srcdir}/grub-bios/"
|
||||
|
||||
echo "Run make install for bios build..."
|
||||
make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
|
||||
echo "Run make install for bios build..."
|
||||
make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
|
||||
|
||||
echo "Remove gdb debugging related files for bios build..."
|
||||
rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.module || true
|
||||
rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.image || true
|
||||
rm -f "${pkgdir}/usr/lib/grub/i386-pc"/{kernel.exec,gdb_grub,gmodule.pl} || true
|
||||
echo "Remove gdb debugging related files for bios build..."
|
||||
rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.module || true
|
||||
rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.image || true
|
||||
rm -f "${pkgdir}/usr/lib/grub/i386-pc"/{kernel.exec,gdb_grub,gmodule.pl} || true
|
||||
|
||||
echo "Install /etc/default/grub (used by grub-mkconfig)..."
|
||||
install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub"
|
||||
echo "Install /etc/default/grub (used by grub-mkconfig)..."
|
||||
install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub"
|
||||
}
|
||||
|
||||
_package_grub-efi() {
|
||||
cd "${srcdir}/grub-efi-${_EFI_ARCH}/"
|
||||
cd "${srcdir}/grub-efi-${_EFI_ARCH}/"
|
||||
|
||||
echo "Run make install for ${_EFI_ARCH} efi build..."
|
||||
make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
|
||||
echo "Run make install for ${_EFI_ARCH} efi build..."
|
||||
make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
|
||||
|
||||
echo "Remove gdb debugging related files for ${_EFI_ARCH} efi build..."
|
||||
rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.module || true
|
||||
rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.image || true
|
||||
rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true
|
||||
echo "Remove gdb debugging related files for ${_EFI_ARCH} efi build..."
|
||||
rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.module || true
|
||||
rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.image || true
|
||||
rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true
|
||||
|
||||
sed -e "s/%PKGVER%/${epoch}:${pkgver}-${pkgrel}/" < "${srcdir}/sbat.csv" > "${pkgdir}/usr/share/grub/sbat.csv"
|
||||
sed -e "s/%PKGVER%/${epoch}:${pkgver}-${pkgrel}/" < "${srcdir}/sbat.csv" > "${pkgdir}/usr/share/grub/sbat.csv"
|
||||
}
|
||||
|
||||
_package_grub-emu() {
|
||||
cd "${srcdir}/grub-emu/"
|
||||
cd "${srcdir}/grub-emu/"
|
||||
|
||||
echo "Run make install for emu build..."
|
||||
make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
|
||||
echo "Run make install for emu build..."
|
||||
make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
|
||||
|
||||
echo "Remove gdb debugging related files for emu build..."
|
||||
rm -f "${pkgdir}/usr/lib/grub/${_EMU_ARCH}-emu"/*.module || true
|
||||
rm -f "${pkgdir}/usr/lib/grub/${_EMU_ARCH}-emu"/*.image || true
|
||||
rm -f "${pkgdir}/usr/lib/grub/${_EMU_ARCH}-emu"/{kernel.exec,gdb_grub,gmodule.pl} || true
|
||||
echo "Remove gdb debugging related files for emu build..."
|
||||
rm -f "${pkgdir}/usr/lib/grub/${_EMU_ARCH}-emu"/*.module || true
|
||||
rm -f "${pkgdir}/usr/lib/grub/${_EMU_ARCH}-emu"/*.image || true
|
||||
rm -f "${pkgdir}/usr/lib/grub/${_EMU_ARCH}-emu"/{kernel.exec,gdb_grub,gmodule.pl} || true
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "${srcdir}/grub/"
|
||||
cd "${srcdir}/grub/"
|
||||
|
||||
echo "Package grub ${_EFI_ARCH} efi stuff..."
|
||||
_package_grub-efi
|
||||
echo "Package grub ${_EFI_ARCH} efi stuff..."
|
||||
_package_grub-efi
|
||||
|
||||
if [[ "${CARCH}" == "x86_64" ]] && [[ "${_IA32_EFI_IN_ARCH_X64}" == "1" ]]; then
|
||||
echo "Package grub i386 efi stuff..."
|
||||
_EFI_ARCH="i386" _package_grub-efi
|
||||
fi
|
||||
if [[ "${CARCH}" == "x86_64" ]] && [[ "${_IA32_EFI_IN_ARCH_X64}" == "1" ]]; then
|
||||
echo "Package grub i386 efi stuff..."
|
||||
_EFI_ARCH="i386" _package_grub-efi
|
||||
fi
|
||||
|
||||
if [[ "${_GRUB_EMU_BUILD}" == "1" ]]; then
|
||||
echo "Package grub emu stuff..."
|
||||
_package_grub-emu
|
||||
fi
|
||||
if [[ "${_GRUB_EMU_BUILD}" == "1" ]]; then
|
||||
echo "Package grub emu stuff..."
|
||||
_package_grub-emu
|
||||
fi
|
||||
|
||||
echo "Package grub bios stuff..."
|
||||
_package_grub-common_and_bios
|
||||
echo "Package grub bios stuff..."
|
||||
_package_grub-common_and_bios
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
GRUB_DEFAULT=0
|
||||
GRUB_TIMEOUT=8
|
||||
GRUB_DISTRIBUTOR="joborun linux w/runit"
|
||||
GRUB_CMDLINE_LINUX_DEFAULT="net.ifnames=0 ipv6.disable=1 loglevel=0 quiet init=/usr/bin/runit-init"
|
||||
GRUB_CMDLINE_LINUX_DEFAULT="net.ifnames=0 ipv6.disable=1 loglevel=0 init=/usr/bin/runit-init"
|
||||
GRUB_CMDLINE_LINUX=""
|
||||
|
||||
# Preload both GPT and MBR modules so that they are not missed
|
||||
|
|
@ -47,7 +47,7 @@ GRUB_COLOR_HIGHLIGHT="yellow/blue"
|
|||
#GRUB_THEME="/path/to/gfxtheme"
|
||||
|
||||
# Uncomment to get a beep at GRUB start
|
||||
GRUB_INIT_TUNE="333 565 2"
|
||||
#GRUB_INIT_TUNE="333 565 1"
|
||||
|
||||
# Uncomment to make GRUB remember the last selection. This requires
|
||||
# setting 'GRUB_DEFAULT=saved' above.
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
GRUB_DEFAULT=0
|
||||
GRUB_TIMEOUT=8
|
||||
GRUB_DISTRIBUTOR="joborun linux with 66"
|
||||
GRUB_CMDLINE_LINUX_DEFAULT="net.ifnames=0 ipv6.disable=1 loglevel=0 quiet "
|
||||
GRUB_CMDLINE_LINUX_DEFAULT="net.ifnames=0 ipv6.disable=1 loglevel=0"
|
||||
GRUB_CMDLINE_LINUX=""
|
||||
|
||||
# Preload both GPT and MBR modules so that they are not missed
|
||||
|
|
@ -47,7 +47,7 @@ GRUB_COLOR_HIGHLIGHT="yellow/blue"
|
|||
#GRUB_THEME="/path/to/gfxtheme"
|
||||
|
||||
# Uncomment to get a beep at GRUB start
|
||||
GRUB_INIT_TUNE="333 565 2"
|
||||
#GRUB_INIT_TUNE="333 565 1"
|
||||
|
||||
# Uncomment to make GRUB remember the last selection. This requires
|
||||
# setting 'GRUB_DEFAULT=saved' above.
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
GRUB_DEFAULT=0
|
||||
GRUB_TIMEOUT=8
|
||||
GRUB_DISTRIBUTOR="joborun linux w/runit"
|
||||
GRUB_CMDLINE_LINUX_DEFAULT="net.ifnames=0 ipv6.disable=1 loglevel=0 quiet init=/usr/bin/runit-init"
|
||||
GRUB_CMDLINE_LINUX_DEFAULT="net.ifnames=0 ipv6.disable=1 loglevel=0 init=/usr/bin/runit-init"
|
||||
GRUB_CMDLINE_LINUX=""
|
||||
|
||||
# Preload both GPT and MBR modules so that they are not missed
|
||||
|
|
@ -47,7 +47,7 @@ GRUB_COLOR_HIGHLIGHT="yellow/blue"
|
|||
#GRUB_THEME="/path/to/gfxtheme"
|
||||
|
||||
# Uncomment to get a beep at GRUB start
|
||||
GRUB_INIT_TUNE="333 565 2"
|
||||
#GRUB_INIT_TUNE="333 565 1"
|
||||
|
||||
# Uncomment to make GRUB remember the last selection. This requires
|
||||
# setting 'GRUB_DEFAULT=saved' above.
|
||||
|
|
|
|||
25
tzdata/0001-Apr-not-April.patch
Normal file
25
tzdata/0001-Apr-not-April.patch
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
From 926b507fa5c3192b1b68fab5910cbd3ba9377c97 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Thu, 5 Sep 2024 14:36:02 -0700
|
||||
Subject: [PATCH] "Apr", not "April", in IN column
|
||||
|
||||
* northamerica (Rule): Use "Apr", not "April", in the IN column.
|
||||
Both forms are valid, but "Apr" is more consistent.
|
||||
Problem reported by Howard Hinnant.
|
||||
---
|
||||
northamerica | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/northamerica b/northamerica
|
||||
index 01f392e0..1af874b6 100644
|
||||
--- a/northamerica
|
||||
+++ b/northamerica
|
||||
@@ -2631,7 +2631,7 @@ Zone America/Dawson -9:17:40 - LMT 1900 Aug 20
|
||||
# http://puentelibre.mx/noticia/ciudad_juarez_cambio_horario_noviembre_2022/
|
||||
|
||||
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
|
||||
-Rule Mexico 1931 only - April 30 0:00 1:00 D
|
||||
+Rule Mexico 1931 only - Apr 30 0:00 1:00 D
|
||||
Rule Mexico 1931 only - Oct 1 0:00 0 S
|
||||
Rule Mexico 1939 only - Feb 5 0:00 1:00 D
|
||||
Rule Mexico 1939 only - Jun 25 0:00 0 S
|
||||
|
|
@ -9,14 +9,15 @@ pkgname=tzdata
|
|||
pkgver=2024b
|
||||
_tzcode=2024b
|
||||
_tzdata=2024b
|
||||
pkgrel=01
|
||||
pkgrel=02
|
||||
pkgdesc="Sources for time zone and daylight saving time data"
|
||||
url="https://www.iana.org/time-zones"
|
||||
options=('!emptydirs')
|
||||
optdepends=('bash: for tzselect'
|
||||
'glibc: for zdump, zic')
|
||||
source=(https://www.iana.org/time-zones/repository/releases/tzcode${_tzcode}.tar.gz{,.asc}
|
||||
https://www.iana.org/time-zones/repository/releases/${pkgname}${_tzdata}.tar.gz{,.asc})
|
||||
https://www.iana.org/time-zones/repository/releases/${pkgname}${_tzdata}.tar.gz{,.asc}
|
||||
0001-Apr-not-April.patch)
|
||||
|
||||
_timezones=('africa' 'antarctica' 'asia' 'australasia'
|
||||
'europe' 'northamerica' 'southamerica'
|
||||
|
|
@ -24,6 +25,10 @@ _timezones=('africa' 'antarctica' 'asia' 'australasia'
|
|||
|
||||
prepare() {
|
||||
sed -i "s:sbin:bin:g" Makefile
|
||||
pwd
|
||||
# Use "Apr", not "April", in the IN column
|
||||
patch -Np1 -i ${srcdir}/0001-Apr-not-April.patch
|
||||
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
@ -59,15 +64,17 @@ license=('LicenseRef-tz')
|
|||
|
||||
validpgpkeys=('7E3792A9D8ACF7D633BC1588ED97E90E62AA7E34') # Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
sha256sums=(5e438fc449624906af16a18ff4573739f0cda9862e5ec28d3bcb19cbaed0f672 # tzcode2024b.tar.gz
|
||||
321136b59e3032f74a08d7cba943e14d15cfd0a97bb86783629f56746e778960 # tzcode2024b.tar.gz.asc
|
||||
70e754db126a8d0db3d16d6b4cb5f7ec1e04d5f261255e4558a67fe92d39e550 # tzdata2024b.tar.gz
|
||||
5bc86ae1ee1f600eefefd5377faf5519d4863c960efb625286638d077178d883) # tzdata2024b.tar.gz.asc
|
||||
|
||||
sha512sums=('0e4e872d6c6d9e2ce8c4e567fcbb7658942b8544157d1e48673d9cb989f3af3379fa58e7a71ab98f4a8f2ac6727de1f8c4cd1981053409ebd8989345dc640026'
|
||||
'SKIP'
|
||||
'0d86686e215672343debb3471b7e7ccb8a27f063f085c9b532d5e0470377843daa0dfb6aee0db4fb9068dd52810c69aeee914a1a7c7e603fdecda7e855020193'
|
||||
'SKIP')
|
||||
'SKIP'
|
||||
'19b546392fd0c8c6c2c535ca4e0d83baeef2741ee93cf58d9d8dc4f06d30e69bb47883652d2b3e23838f41d0a8600dbcfb2286bb11d107fb3f4a98920ca9bbcf')
|
||||
|
||||
## 8166207ad4ca9a7a9a4f83b5c79e2902bfe72561ed610c7d13652f5c38d221c8 tzdata-2024b-01-x86_64.pkg.tar.lz
|
||||
sha256sums=(5e438fc449624906af16a18ff4573739f0cda9862e5ec28d3bcb19cbaed0f672 # tzcode2024b.tar.gz
|
||||
321136b59e3032f74a08d7cba943e14d15cfd0a97bb86783629f56746e778960 # tzcode2024b.tar.gz.asc
|
||||
70e754db126a8d0db3d16d6b4cb5f7ec1e04d5f261255e4558a67fe92d39e550 # tzdata2024b.tar.gz
|
||||
5bc86ae1ee1f600eefefd5377faf5519d4863c960efb625286638d077178d883 # tzdata2024b.tar.gz.asc
|
||||
54d8edcaa80cd71535c8c0528fa5dde6ba1d87bb1db8389d55499e6efbfca6b2) # 0001-Apr-not-April.patch
|
||||
|
||||
## b430940ccda2349e3eb3dc1738c65b50ea1ba500441d252c77233de6f1198ee8 tzdata-2024b-02-x86_64.pkg.tar.lz
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ pkgname=tzdata
|
|||
pkgver=2024b
|
||||
_tzcode=2024b
|
||||
_tzdata=2024b
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="Sources for time zone and daylight saving time data"
|
||||
arch=('x86_64')
|
||||
url="https://www.iana.org/time-zones"
|
||||
|
|
@ -13,11 +13,13 @@ optdepends=('bash: for tzselect'
|
|||
'glibc: for zdump, zic')
|
||||
options=('!emptydirs')
|
||||
source=(https://www.iana.org/time-zones/repository/releases/tzcode${_tzcode}.tar.gz{,.asc}
|
||||
https://www.iana.org/time-zones/repository/releases/${pkgname}${_tzdata}.tar.gz{,.asc})
|
||||
https://www.iana.org/time-zones/repository/releases/${pkgname}${_tzdata}.tar.gz{,.asc}
|
||||
0001-Apr-not-April.patch)
|
||||
sha512sums=('0e4e872d6c6d9e2ce8c4e567fcbb7658942b8544157d1e48673d9cb989f3af3379fa58e7a71ab98f4a8f2ac6727de1f8c4cd1981053409ebd8989345dc640026'
|
||||
'SKIP'
|
||||
'0d86686e215672343debb3471b7e7ccb8a27f063f085c9b532d5e0470377843daa0dfb6aee0db4fb9068dd52810c69aeee914a1a7c7e603fdecda7e855020193'
|
||||
'SKIP')
|
||||
'SKIP'
|
||||
'19b546392fd0c8c6c2c535ca4e0d83baeef2741ee93cf58d9d8dc4f06d30e69bb47883652d2b3e23838f41d0a8600dbcfb2286bb11d107fb3f4a98920ca9bbcf')
|
||||
validpgpkeys=('7E3792A9D8ACF7D633BC1588ED97E90E62AA7E34') # Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
_timezones=('africa' 'antarctica' 'asia' 'australasia'
|
||||
|
|
@ -25,6 +27,10 @@ _timezones=('africa' 'antarctica' 'asia' 'australasia'
|
|||
'etcetera' 'backward' 'factory')
|
||||
|
||||
prepare() {
|
||||
pwd
|
||||
# Use "Apr", not "April", in the IN column
|
||||
patch -Np1 -i ${srcdir}/0001-Apr-not-April.patch
|
||||
|
||||
sed -i "s:sbin:bin:g" Makefile
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue