Fix package names

3 files changed, 15 insertions, 9 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..cd3f93a55422
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+linux-mainline-anbox
+pkg
+src
diff --git a/PKGBUILD b/PKGBUILD
index ea6d515fc2c5..4ae4fea8c2ee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgbase=linux-mainline-anbox-git
-pkgver=5.17.r11138.gf022814633e1
+pkgver=5.17.r11406.gf82da161ea75
 pkgrel=1
 pkgdesc='Linux Mainline'
 url="https://www.kernel.org"
@@ -16,7 +16,7 @@ makedepends=(
 options=('!strip')
 _srcname=linux-mainline-anbox
 source=(
-  'git+https://github.com/torvalds/linux'
+  "$_srcname::git+https://github.com/torvalds/linux"
   config         # the main kernel config file
 )
 sha256sums=('SKIP'
@@ -38,7 +38,7 @@ prepare() {
   echo "Setting version..."
   scripts/setlocalversion --save-scmversion
   echo "-$pkgrel" > localversion.10-pkgrel
-  echo "${pkgbase#linux}" > localversion.20-pkgname
+  echo "${_srcname#linux}" > localversion.20-pkgname
 
   local src
   for src in "${source[@]}"; do
@@ -52,6 +52,7 @@ prepare() {
   echo "Setting config..."
   cp ../config .config
   make olddefconfig
+  cat .config > ../config # Prevent stagnation
 
   make -s kernelrelease > version
   echo "Prepared $pkgbase version $(<version)"
@@ -81,7 +82,7 @@ _package() {
   install -Dm644 "$(make -s image_name)" "$modulesdir/vmlinuz"
 
   # Used by mkinitcpio to name the kernel
-  echo "$pkgbase" | install -Dm644 /dev/stdin "$modulesdir/pkgbase"
+  echo "$_srcname" | install -Dm644 /dev/stdin "$modulesdir/pkgbase"
 
   echo "Installing modules..."
   make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 modules_install
@@ -187,15 +188,15 @@ _package-docs() {
 
   echo "Adding symlink..."
   mkdir -p "$pkgdir/usr/share/doc"
-  ln -sr "$builddir/Documentation" "$pkgdir/usr/share/doc/$pkgbase"
+  ln -sr "$builddir/Documentation" "$pkgdir/usr/share/doc/$_srcname"
 }
 
 
-pkgname=("$pkgbase" "$pkgbase-headers" "$pkgbase-docs")
+pkgname=("$_srcname" "$_srcname-headers" "$_srcname-docs")
 for _p in "${pkgname[@]}"; do
   eval "package_$_p() {
-    $(declare -f "_package${_p#$pkgbase}")
-    _package${_p#$pkgbase}
+    $(declare -f "_package${_p#$_srcname}")
+    _package${_p#$_srcname}
   }"
 done
 
diff --git a/config b/config
index b149e7914eba..e78baeba0df0 100644
--- a/config
+++ b/config
@@ -475,6 +475,8 @@ CONFIG_ARCH_USES_PG_UNCACHED=y
 CONFIG_ARCH_RANDOM=y
 CONFIG_X86_SMAP=y
 CONFIG_X86_UMIP=y
+CONFIG_CC_HAS_IBT=y
+# CONFIG_X86_KERNEL_IBT is not set
 CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
 # CONFIG_X86_INTEL_TSX_MODE_OFF is not set
 # CONFIG_X86_INTEL_TSX_MODE_ON is not set
@@ -686,7 +688,7 @@ CONFIG_AMD_NB=y
 # Binary Emulations
 #
 CONFIG_IA32_EMULATION=y
-# CONFIG_X86_X32 is not set
+# CONFIG_X86_X32_ABI is not set
 CONFIG_COMPAT_32=y
 CONFIG_COMPAT=y
 CONFIG_COMPAT_FOR_U64_ALIGNMENT=y