Make real debug packages with makepkg

Signed-off-by: Vasiliy Stelmachenok <[email protected]>
CachyOS · Sep 14, 2024 · aa6ca93 · aa6ca93
1 parent 07ecd94
commit aa6ca93
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 154 deletions.
diff --git a/linux-cachyos-bore/PKGBUILD b/linux-cachyos-bore/PKGBUILD
@@ -141,9 +141,6 @@ _build_nvidia=${_build_nvidia-}
 # Use this only if you have Turing+ GPU
 _build_nvidia_open=${_build_nvidia_open-}
 
-# Build a debug package with non-stripped vmlinux
-_build_debug=${_build_debug-}
-
 if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] && [ "$_use_lto_suffix" = "y"  ]; then
     _pkgsuffix="cachyos-${_cpusched}-lto"
     pkgbase="linux-$_pkgsuffix"
@@ -169,7 +166,7 @@ _kernuname="${pkgver}-${_pkgsuffix}"
 arch=('x86_64')
 url="https://github.com/CachyOS/linux-cachyos"
 license=('GPL-2.0-only')
-options=('!strip' '!debug' '!lto')
+options=('!lto')
 makedepends=(
   bc
   cpio
@@ -700,15 +697,6 @@ _package-headers() {
     ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
 }
 
-_package-dbg(){
-    pkgdesc="Non-stripped vmlinux file for the $pkgdesc kernel"
-    depends=("${pkgbase}-headers")
-
-    cd "${_srcname}"
-    mkdir -p "$pkgdir/usr/src/debug/${pkgbase}"
-    install -Dt "$pkgdir/usr/src/debug/${pkgbase}" -m644 vmlinux
-}
-
 _package-zfs(){
     pkgdesc="zfs module for the $pkgdesc kernel"
     depends=('pahole' "${pkgbase}=${_kernver}")
@@ -761,7 +749,6 @@ _package-nvidia-open(){
 }
 
 pkgname=("$pkgbase")
-[ -n "$_build_debug" ] && pkgname+=("$pkgbase-dbg")
 pkgname+=("$pkgbase-headers")
 [ -n "$_build_zfs" ] && pkgname+=("$pkgbase-zfs")
 [ -n "$_build_nvidia" ] && pkgname+=("$pkgbase-nvidia")

diff --git a/linux-cachyos-deckify/PKGBUILD b/linux-cachyos-deckify/PKGBUILD
@@ -141,9 +141,6 @@ _build_nvidia=${_build_nvidia-}
 # Use this only if you have Turing+ GPU
 _build_nvidia_open=${_build_nvidia_open-}
 
-# Build a debug package with non-stripped vmlinux
-_build_debug=${_build_debug-}
-
 if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] && [ "$_use_lto_suffix" = "y"  ]; then
     _pkgsuffix=cachyos-deckify-lto
     pkgbase="linux-$_pkgsuffix"
@@ -169,7 +166,7 @@ _kernuname="${pkgver}-${_pkgsuffix}"
 arch=('x86_64')
 url="https://github.com/CachyOS/linux-cachyos"
 license=('GPL-2.0-only')
-options=('!strip' '!debug' '!lto')
+options=('!lto')
 makedepends=(
   bc
   cpio
@@ -703,15 +700,6 @@ _package-headers() {
     ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
 }
 
-_package-dbg(){
-    pkgdesc="Non-stripped vmlinux file for the $pkgdesc kernel"
-    depends=("${pkgbase}-headers")
-
-    cd "${_srcname}"
-    mkdir -p "$pkgdir/usr/src/debug/${pkgbase}"
-    install -Dt "$pkgdir/usr/src/debug/${pkgbase}" -m644 vmlinux
-}
-
 _package-zfs(){
     pkgdesc="zfs module for the $pkgdesc kernel"
     depends=('pahole' "${pkgbase}=${_kernver}")
@@ -764,7 +752,6 @@ _package-nvidia-open(){
 }
 
 pkgname=("$pkgbase")
-[ -n "$_build_debug" ] && pkgname+=("$pkgbase-dbg")
 pkgname+=("$pkgbase-headers")
 [ -n "$_build_zfs" ] && pkgname+=("$pkgbase-zfs")
 [ -n "$_build_nvidia" ] && pkgname+=("$pkgbase-nvidia")

diff --git a/linux-cachyos-echo/PKGBUILD b/linux-cachyos-echo/PKGBUILD
@@ -141,9 +141,6 @@ _build_nvidia=${_build_nvidia-}
 # Use this only if you have Turing+ GPU
 _build_nvidia_open=${_build_nvidia_open-}
 
-# Build a debug package with non-stripped vmlinux
-_build_debug=${_build_debug-}
-
 if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] && [ "$_use_lto_suffix" = "y"  ]; then
     _pkgsuffix="cachyos-${_cpusched}-lto"
     pkgbase="linux-$_pkgsuffix"
@@ -169,7 +166,7 @@ _kernuname="${pkgver}-${_pkgsuffix}"
 arch=('x86_64')
 url="https://github.com/CachyOS/linux-cachyos"
 license=('GPL-2.0-only')
-options=('!strip' '!debug' '!lto')
+options=('!lto')
 makedepends=(
   bc
   cpio
@@ -700,15 +697,6 @@ _package-headers() {
     ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
 }
 
-_package-dbg(){
-    pkgdesc="Non-stripped vmlinux file for the $pkgdesc kernel"
-    depends=("${pkgbase}-headers")
-
-    cd "${_srcname}"
-    mkdir -p "$pkgdir/usr/src/debug/${pkgbase}"
-    install -Dt "$pkgdir/usr/src/debug/${pkgbase}" -m644 vmlinux
-}
-
 _package-zfs(){
     pkgdesc="zfs module for the $pkgdesc kernel"
     depends=('pahole' "${pkgbase}=${_kernver}")
@@ -761,7 +749,6 @@ _package-nvidia-open(){
 }
 
 pkgname=("$pkgbase")
-[ -n "$_build_debug" ] && pkgname+=("$pkgbase-dbg")
 pkgname+=("$pkgbase-headers")
 [ -n "$_build_zfs" ] && pkgname+=("$pkgbase-zfs")
 [ -n "$_build_nvidia" ] && pkgname+=("$pkgbase-nvidia")

diff --git a/linux-cachyos-eevdf/PKGBUILD b/linux-cachyos-eevdf/PKGBUILD
@@ -141,9 +141,6 @@ _build_nvidia=${_build_nvidia-}
 # Use this only if you have Turing+ GPU
 _build_nvidia_open=${_build_nvidia_open-}
 
-# Build a debug package with non-stripped vmlinux
-_build_debug=${_build_debug-}
-
 if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] && [ "$_use_lto_suffix" = "y"  ]; then
     _pkgsuffix="cachyos-${_cpusched}-lto"
     pkgbase="linux-$_pkgsuffix"
@@ -169,7 +166,7 @@ _kernuname="${pkgver}-${_pkgsuffix}"
 arch=('x86_64')
 url="https://github.com/CachyOS/linux-cachyos"
 license=('GPL-2.0-only')
-options=('!strip' '!debug' '!lto')
+options=('!lto')
 makedepends=(
   bc
   cpio
@@ -700,15 +697,6 @@ _package-headers() {
     ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
 }
 
-_package-dbg(){
-    pkgdesc="Non-stripped vmlinux file for the $pkgdesc kernel"
-    depends=("${pkgbase}-headers")
-
-    cd "${_srcname}"
-    mkdir -p "$pkgdir/usr/src/debug/${pkgbase}"
-    install -Dt "$pkgdir/usr/src/debug/${pkgbase}" -m644 vmlinux
-}
-
 _package-zfs(){
     pkgdesc="zfs module for the $pkgdesc kernel"
     depends=('pahole' "${pkgbase}=${_kernver}")
@@ -761,7 +749,6 @@ _package-nvidia-open(){
 }
 
 pkgname=("$pkgbase")
-[ -n "$_build_debug" ] && pkgname+=("$pkgbase-dbg")
 pkgname+=("$pkgbase-headers")
 [ -n "$_build_zfs" ] && pkgname+=("$pkgbase-zfs")
 [ -n "$_build_nvidia" ] && pkgname+=("$pkgbase-nvidia")

diff --git a/linux-cachyos-hardened/PKGBUILD b/linux-cachyos-hardened/PKGBUILD
@@ -141,9 +141,6 @@ _build_nvidia=${_build_nvidia-}
 # Use this only if you have Turing+ GPU
 _build_nvidia_open=${_build_nvidia_open-}
 
-# Build a debug package with non-stripped vmlinux
-_build_debug=${_build_debug-}
-
 if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] && [ "$_use_lto_suffix" = "y"  ]; then
     _pkgsuffix="cachyos-${_cpusched}-lto"
     pkgbase="linux-$_pkgsuffix"
@@ -169,7 +166,7 @@ _kernuname="${pkgver}-${_pkgsuffix}"
 arch=('x86_64')
 url="https://github.com/CachyOS/linux-cachyos"
 license=('GPL-2.0-only')
-options=('!strip' '!debug' '!lto')
+options=('!lto')
 makedepends=(
   bc
   cpio
@@ -699,15 +696,6 @@ _package-headers() {
     ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
 }
 
-_package-dbg(){
-    pkgdesc="Non-stripped vmlinux file for the $pkgdesc kernel"
-    depends=("${pkgbase}-headers")
-
-    cd "${_srcname}"
-    mkdir -p "$pkgdir/usr/src/debug/${pkgbase}"
-    install -Dt "$pkgdir/usr/src/debug/${pkgbase}" -m644 vmlinux
-}
-
 _package-zfs(){
     pkgdesc="zfs module for the $pkgdesc kernel"
     depends=('pahole' "${pkgbase}=${_kernver}")
@@ -760,7 +748,6 @@ _package-nvidia-open(){
 }
 
 pkgname=("$pkgbase")
-[ -n "$_build_debug" ] && pkgname+=("$pkgbase-dbg")
 pkgname+=("$pkgbase-headers")
 [ -n "$_build_zfs" ] && pkgname+=("$pkgbase-zfs")
 [ -n "$_build_nvidia" ] && pkgname+=("$pkgbase-nvidia")

diff --git a/linux-cachyos-lts/PKGBUILD b/linux-cachyos-lts/PKGBUILD
@@ -161,9 +161,6 @@ _bcachefs=${_bcachefs-}
 # Use this only if you have Turing+ GPU
 _build_nvidia_open=${_build_nvidia_open-}
 
-# Build a debug package with non-stripped vmlinux
-_build_debug=${_build_debug-}
-
 if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] && [ "$_use_lto_suffix" = "y"  ]; then
     _pkgsuffix=cachyos-lts-lto
     pkgbase="linux-$_pkgsuffix"
@@ -189,7 +186,7 @@ _kernuname="${pkgver}-${_pkgsuffix}"
 arch=('x86_64')
 url="https://github.com/CachyOS/linux-cachyos"
 license=('GPL-2.0-only')
-options=('!strip' '!debug' '!lto')
+options=('!lto')
 makedepends=(
   bc
   cpio
@@ -768,15 +765,6 @@ _package-headers() {
     ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
 }
 
-_package-dbg(){
-    pkgdesc="Non-stripped vmlinux file for the $pkgdesc kernel"
-    depends=("${pkgbase}-headers")
-
-    cd "${_srcname}"
-    mkdir -p "$pkgdir/usr/src/debug/${pkgbase}"
-    install -Dt "$pkgdir/usr/src/debug/${pkgbase}" -m644 vmlinux
-}
-
 _package-zfs(){
     pkgdesc="zfs module for the $pkgdesc kernel"
     depends=('pahole' "${pkgbase}=${_kernver}")
@@ -829,7 +817,6 @@ _package-nvidia-open(){
 }
 
 pkgname=("$pkgbase")
-[ -n "$_build_debug" ] && pkgname+=("$pkgbase-dbg")
 pkgname+=("$pkgbase-headers")
 [ -n "$_build_zfs" ] && pkgname+=("$pkgbase-zfs")
 [ -n "$_build_nvidia" ] && pkgname+=("$pkgbase-nvidia")

diff --git a/linux-cachyos-rc/PKGBUILD b/linux-cachyos-rc/PKGBUILD
@@ -141,9 +141,6 @@ _build_nvidia=${_build_nvidia-}
 # Use this only if you have Turing+ GPU
 _build_nvidia_open=${_build_nvidia_open-}
 
-# Build a debug package with non-stripped vmlinux
-_build_debug=${_build_debug-}
-
 if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] && [ "$_use_lto_suffix" = "y"  ]; then
     _pkgsuffix=cachyos-rc-lto
     pkgbase="linux-$_pkgsuffix"
@@ -169,7 +166,7 @@ _kernuname="${pkgver}-${_pkgsuffix}"
 arch=('x86_64')
 url="https://github.com/CachyOS/linux-cachyos"
 license=('GPL-2.0-only')
-options=('!strip' '!debug' '!lto')
+options=('!lto')
 makedepends=(
   bc
   cpio
@@ -703,15 +700,6 @@ _package-headers() {
     ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
 }
 
-_package-dbg(){
-    pkgdesc="Non-stripped vmlinux file for the $pkgdesc kernel"
-    depends=("${pkgbase}-headers")
-
-    cd "${_srcname}"
-    mkdir -p "$pkgdir/usr/src/debug/${pkgbase}"
-    install -Dt "$pkgdir/usr/src/debug/${pkgbase}" -m644 vmlinux
-}
-
 _package-zfs(){
     pkgdesc="zfs module for the $pkgdesc kernel"
     depends=('pahole' "${pkgbase}=${_kernver}")
@@ -764,7 +752,6 @@ _package-nvidia-open(){
 }
 
 pkgname=("$pkgbase")
-[ -n "$_build_debug" ] && pkgname+=("$pkgbase-dbg")
 pkgname+=("$pkgbase-headers")
 [ -n "$_build_zfs" ] && pkgname+=("$pkgbase-zfs")
 [ -n "$_build_nvidia" ] && pkgname+=("$pkgbase-nvidia")

diff --git a/linux-cachyos-rt-bore/PKGBUILD b/linux-cachyos-rt-bore/PKGBUILD
@@ -141,9 +141,6 @@ _build_nvidia=${_build_nvidia-}
 # Use this only if you have Turing+ GPU
 _build_nvidia_open=${_build_nvidia_open-}
 
-# Build a debug package with non-stripped vmlinux
-_build_debug=${_build_debug-}
-
 if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] && [ "$_use_lto_suffix" = "y"  ]; then
     _pkgsuffix="cachyos-${_cpusched}-lto"
     pkgbase="linux-$_pkgsuffix"
@@ -169,7 +166,7 @@ _kernuname="${pkgver}-${_pkgsuffix}"
 arch=('x86_64')
 url="https://github.com/CachyOS/linux-cachyos"
 license=('GPL-2.0-only')
-options=('!strip' '!debug' '!lto')
+options=('!lto')
 makedepends=(
   bc
   cpio
@@ -700,15 +697,6 @@ _package-headers() {
     ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
 }
 
-_package-dbg(){
-    pkgdesc="Non-stripped vmlinux file for the $pkgdesc kernel"
-    depends=("${pkgbase}-headers")
-
-    cd "${_srcname}"
-    mkdir -p "$pkgdir/usr/src/debug/${pkgbase}"
-    install -Dt "$pkgdir/usr/src/debug/${pkgbase}" -m644 vmlinux
-}
-
 _package-zfs(){
     pkgdesc="zfs module for the $pkgdesc kernel"
     depends=('pahole' "${pkgbase}=${_kernver}")
@@ -761,7 +749,6 @@ _package-nvidia-open(){
 }
 
 pkgname=("$pkgbase")
-[ -n "$_build_debug" ] && pkgname+=("$pkgbase-dbg")
 pkgname+=("$pkgbase-headers")
 [ -n "$_build_zfs" ] && pkgname+=("$pkgbase-zfs")
 [ -n "$_build_nvidia" ] && pkgname+=("$pkgbase-nvidia")

diff --git a/linux-cachyos-sched-ext/PKGBUILD b/linux-cachyos-sched-ext/PKGBUILD
@@ -141,9 +141,6 @@ _build_nvidia=${_build_nvidia-}
 # Use this only if you have Turing+ GPU
 _build_nvidia_open=${_build_nvidia_open-}
 
-# Build a debug package with non-stripped vmlinux
-_build_debug=${_build_debug-}
-
 if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] && [ "$_use_lto_suffix" = "y"  ]; then
     _pkgsuffix="cachyos-${_cpusched}-lto"
     pkgbase="linux-$_pkgsuffix"
@@ -169,7 +166,7 @@ _kernuname="${pkgver}-${_pkgsuffix}"
 arch=('x86_64')
 url="https://github.com/CachyOS/linux-cachyos"
 license=('GPL-2.0-only')
-options=('!strip' '!debug' '!lto')
+options=('!lto')
 makedepends=(
   bc
   cpio
@@ -700,15 +697,6 @@ _package-headers() {
     ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
 }
 
-_package-dbg(){
-    pkgdesc="Non-stripped vmlinux file for the $pkgdesc kernel"
-    depends=("${pkgbase}-headers")
-
-    cd "${_srcname}"
-    mkdir -p "$pkgdir/usr/src/debug/${pkgbase}"
-    install -Dt "$pkgdir/usr/src/debug/${pkgbase}" -m644 vmlinux
-}
-
 _package-zfs(){
     pkgdesc="zfs module for the $pkgdesc kernel"
     depends=('pahole' "${pkgbase}=${_kernver}")
@@ -761,7 +749,6 @@ _package-nvidia-open(){
 }
 
 pkgname=("$pkgbase")
-[ -n "$_build_debug" ] && pkgname+=("$pkgbase-dbg")
 pkgname+=("$pkgbase-headers")
 [ -n "$_build_zfs" ] && pkgname+=("$pkgbase-zfs")
 [ -n "$_build_nvidia" ] && pkgname+=("$pkgbase-nvidia")