summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-11-19 17:43:28 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-11-19 17:43:28 -0300
commit9a1e45b64840472e427edab26454fb66264bd514 (patch)
tree65443b54b99dabff53eabb31ac08f36bf5c4bd1c
parentd0fac119d9651c018c4e2a04348ceaef2552cc24 (diff)
downloadabslibre-9a1e45b64840472e427edab26454fb66264bd514.tar.gz
abslibre-9a1e45b64840472e427edab26454fb66264bd514.tar.bz2
abslibre-9a1e45b64840472e427edab26454fb66264bd514.zip
linux-libre-rt-4.8.6_gnu.rt5-2: updating revision
* fix lvm2 breakage, move to mkinitcpio running as pacman hook - FS#51818 -> https://bugs.archlinux.org/task/51818 * overhaul sed'ding * enable CONFIG_MTD_NAND_NANDSIM - Bug #1143 -> https://labs.parabola.nu/issues/1143
-rw-r--r--kernels/linux-libre-rt/99-linux.hook11
-rw-r--r--kernels/linux-libre-rt/PKGBUILD29
-rw-r--r--kernels/linux-libre-rt/config.armv7h2
-rw-r--r--kernels/linux-libre-rt/linux.install20
-rw-r--r--kernels/linux-libre-rt/linux.preset8
5 files changed, 34 insertions, 36 deletions
diff --git a/kernels/linux-libre-rt/99-linux.hook b/kernels/linux-libre-rt/99-linux.hook
new file mode 100644
index 000000000..985115199
--- /dev/null
+++ b/kernels/linux-libre-rt/99-linux.hook
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Target = boot/vmlinuz-%PKGBASE%
+Target = usr/lib/initcpio/*
+
+[Action]
+Description = Updating %PKGBASE% initcpios
+When = PostTransaction
+Exec = /usr/bin/mkinitcpio -p %PKGBASE%
diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD
index 09335f756..353ef0d1d 100644
--- a/kernels/linux-libre-rt/PKGBUILD
+++ b/kernels/linux-libre-rt/PKGBUILD
@@ -21,7 +21,7 @@ _replacesoldmodules=() # '%' gets replaced with _kernelname
_srcname=linux-${_pkgbasever%-*}
_archpkgver=${_pkgver%-*}_${_rtpatchver}
pkgver=${_pkgver//-/_}.${_rtpatchver}
-pkgrel=1
+pkgrel=2
rcnrel=armv7-x4
arch=('i686' 'x86_64' 'armv7h')
url="https://rt.wiki.kernel.org/"
@@ -43,6 +43,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
"https://repo.parabola.nu/other/linux-libre/logos/logo_linux_vga16.ppm.sig"
# the main kernel config files
'config.i686' 'config.x86_64' 'config.armv7h'
+ # pacman hook for initramfs regeneration
+ '99-linux.hook'
# standard config files for mkinitcpio ramdisk
'linux.preset'
'change-default-console-loglevel.patch'
@@ -79,8 +81,9 @@ sha256sums=('d54e0f8a27e24f3666c19b395c19dba194635db26929c89e78ffa4b2b0e8ca3a'
'SKIP'
'cde14ecb6628addddce0854e1d6ff87df1627d56dc56b03a64fa957eb821b10f'
'c45f0960bca7e0e063d41e0691eefb5cf9db85fdbf35bb6243881d5a32f7f870'
- '4f41fd9878ae11dd9927f05c491b0680555d1c8afd4e5bc496ebc064a5e4ccd1'
- 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
+ 'c9d891b21f106e0e47d52f34c598ef56901b22302a26dc3a3247522b7eb9feae'
+ '834bd254b56ab71d73f59b3221f056c72f559553c04718e350ab2a3e2991afe0'
+ 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
'1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
'0376bd5efa31d4e2a9d52558777cebd9f0941df8e1adab916c868bf0c05f2fc3'
'351fd96be8cd5ebd0435c0a8a978673fc023e3b1026085e67f86d815b2285e25'
@@ -240,22 +243,18 @@ _package() {
fi
# set correct depmod command for install
- cp -f "${startdir}/${install}" "${startdir}/${install}.pkg"
+ sed -e "s|%PKGBASE%|${pkgbase}|g;s|%KERNVER%|${_kernver}|g" \
+ "${startdir}/${install}" > "${startdir}/${install}.pkg"
true && install=${install}.pkg
- sed \
- -e "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/" \
- -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" \
- -i "${startdir}/${install}"
if [ "${CARCH}" = "x86_64" ] || [ "${CARCH}" = "i686" ]; then
# install mkinitcpio preset file for kernel
- install -D -m644 "${srcdir}/linux.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
- sed \
- -e "1s|'linux.*'|'${pkgbase}'|" \
- -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgbase}\"|" \
- -e "s|default_image=.*|default_image=\"/boot/initramfs-${pkgbase}.img\"|" \
- -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgbase}-fallback.img\"|" \
- -i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
+ sed "s|%PKGBASE%|${pkgbase}|g" "${srcdir}/linux.preset" |
+ install -D -m644 /dev/stdin "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
+
+ # install pacman hook for initramfs regeneration
+ sed "s|%PKGBASE%|${pkgbase}|g" "${srcdir}/99-linux.hook" |
+ install -D -m644 /dev/stdin "${pkgdir}/usr/share/libalpm/hooks/99-${pkgbase}.hook"
fi
# remove build and source links
diff --git a/kernels/linux-libre-rt/config.armv7h b/kernels/linux-libre-rt/config.armv7h
index df3546d0d..8703ad350 100644
--- a/kernels/linux-libre-rt/config.armv7h
+++ b/kernels/linux-libre-rt/config.armv7h
@@ -1998,7 +1998,7 @@ CONFIG_MTD_NAND_RICOH=m
# CONFIG_MTD_NAND_DOCG4 is not set
CONFIG_MTD_NAND_CAFE=m
CONFIG_MTD_NAND_PXA3xx=y
-# CONFIG_MTD_NAND_NANDSIM is not set
+CONFIG_MTD_NAND_NANDSIM=m
# CONFIG_MTD_NAND_GPMI_NAND is not set
# CONFIG_MTD_NAND_BRCMNAND is not set
# CONFIG_MTD_NAND_PLATFORM is not set
diff --git a/kernels/linux-libre-rt/linux.install b/kernels/linux-libre-rt/linux.install
index 378733c98..97a2a8133 100644
--- a/kernels/linux-libre-rt/linux.install
+++ b/kernels/linux-libre-rt/linux.install
@@ -1,33 +1,21 @@
-# arg 1: the new package version
-# arg 2: the old package version
-
-KERNEL_NAME=
-KERNEL_VERSION=
-
post_install () {
# updating module dependencies
echo ">>> Updating module dependencies. Please wait ..."
- depmod ${KERNEL_VERSION}
+ depmod %KERNVER%
if [ "$(uname -m)" = "armv7l" ]; then
echo ">>> WARNING: Using this kernel requires an updated U-Boot!"
- elif [ "$(uname -m)" = "x86_64" ] || [ "$(uname -m)" = "i686" ]; then
- echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..."
- mkinitcpio -p linux-libre${KERNEL_NAME}
fi
}
post_upgrade() {
# updating module dependencies
echo ">>> Updating module dependencies. Please wait ..."
- depmod ${KERNEL_VERSION}
+ depmod %KERNVER%
if [ "$(uname -m)" = "x86_64" ] || [ "$(uname -m)" = "i686" ]; then
if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then
echo "WARNING: /boot appears to be a separate partition but is not mounted."
fi
- echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..."
- mkinitcpio -p linux-libre${KERNEL_NAME}
-
if [ $(vercmp $2 3.13) -lt 0 ]; then
echo ">>> WARNING: AT keyboard support is no longer built into the kernel."
echo ">>> In order to use your keyboard during early init, you MUST"
@@ -39,7 +27,7 @@ post_upgrade() {
if [ "$(uname -m)" = "x86_64" ] || [ "$(uname -m)" = "i686" ]; then
post_remove() {
# also remove the compat symlinks
- rm -f boot/initramfs-linux-libre${KERNEL_NAME}.img
- rm -f boot/initramfs-linux-libre${KERNEL_NAME}-fallback.img
+ rm -f boot/initramfs-%PKGBASE%.img
+ rm -f boot/initramfs-%PKGBASE%-fallback.img
}
fi
diff --git a/kernels/linux-libre-rt/linux.preset b/kernels/linux-libre-rt/linux.preset
index b06292d10..66709a8c1 100644
--- a/kernels/linux-libre-rt/linux.preset
+++ b/kernels/linux-libre-rt/linux.preset
@@ -1,14 +1,14 @@
-# mkinitcpio preset file for the 'linux' package
+# mkinitcpio preset file for the '%PKGBASE%' package
ALL_config="/etc/mkinitcpio.conf"
-ALL_kver="/boot/vmlinuz-linux"
+ALL_kver="/boot/vmlinuz-%PKGBASE%"
PRESETS=('default' 'fallback')
#default_config="/etc/mkinitcpio.conf"
-default_image="/boot/initramfs-linux.img"
+default_image="/boot/initramfs-%PKGBASE%.img"
#default_options=""
#fallback_config="/etc/mkinitcpio.conf"
-fallback_image="/boot/initramfs-linux-fallback.img"
+fallback_image="/boot/initramfs-%PKGBASE%-fallback.img"
fallback_options="-S autodetect"