summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorgraysky2020-06-12 05:19:56 -0400
committergraysky2020-06-12 05:19:56 -0400
commit30759d8df573d5aea25106ce82f922f1e9f4a261 (patch)
treea5a5a9ede9830914238522bf297f9ac9d83106f5
parent2b6a356337429a433f3cc364ed071a8d29e44397 (diff)
downloadaur-30759d8df573d5aea25106ce82f922f1e9f4a261.tar.gz
Update to 5.7.2-2
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD19
2 files changed, 15 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1c5d422238d..a9c2934366a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,12 @@
pkgbase = linux-ck
pkgver = 5.7.2
- pkgrel = 1
+ pkgrel = 2
url = https://wiki.archlinux.org/index.php/Linux-ck
arch = x86_64
license = GPL2
makedepends = bc
makedepends = kmod
makedepends = libelf
- makedepends = pahole
options = !strip
source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.2.tar.xz
source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.2.tar.sign
diff --git a/PKGBUILD b/PKGBUILD
index e6836d4afa1..ac0d3688086 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -65,13 +65,13 @@ _localmodcfg=
pkgbase=linux-ck
pkgver=5.7.2
-pkgrel=1
+pkgrel=2
_ckpatchversion=1
arch=(x86_64)
url="https://wiki.archlinux.org/index.php/Linux-ck"
license=(GPL2)
makedepends=(
- bc kmod libelf pahole
+ bc kmod libelf
)
options=('!strip')
_ckpatch="patch-5.7-ck${_ckpatchversion}"
@@ -136,6 +136,11 @@ prepare() {
# fix naming schema in EXTRAVERSION of ck patch set
sed -i -re "s/^(.EXTRAVERSION).*$/\1 = /" "../${_ckpatch}"
+ # disable CONFIG_DEBUG_INFO=y at build time introduced in this commit
+ # https://git.archlinux.org/svntogit/packages.git/commit/trunk?h=packages/linux&id=663b08666b269eeeeaafbafaee07fd03389ac8d7
+ sed -i -e 's/CONFIG_DEBUG_INFO=y/# CONFIG_DEBUG_INFO is not set/' \
+ -i -e '/CONFIG_DEBUG_INFO_DWARF4=y/d' -i -e '/CONFIG_DEBUG_INFO_BTF=y/d' ./.config
+
echo "Patching with ck patchset..."
# ck patchset itself
@@ -210,7 +215,10 @@ _package() {
echo "$pkgbase" | install -Dm644 /dev/stdin "$modulesdir/pkgbase"
echo "Installing modules..."
- make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 modules_install
+ #make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 modules_install
+ # not needed since not building with CONFIG_DEBUG_INFO=y
+
+ make INSTALL_MOD_PATH="$pkgdir/usr" modules_install
# remove build and source links
rm "$modulesdir"/{source,build}
@@ -289,8 +297,9 @@ _package-headers() {
esac
done < <(find "$builddir" -type f -perm -u+x ! -name vmlinux -print0)
- echo "Stripping vmlinux..."
- strip -v $STRIP_STATIC "$builddir/vmlinux"
+ #echo "Stripping vmlinux..."
+ #strip -v $STRIP_STATIC "$builddir/vmlinux"
+ # not needed since not building with CONFIG_DEBUG_INFO=y
echo "Adding symlink..."
mkdir -p "$pkgdir/usr/src"