Skip to content

Commit 4fcf071

Browse files
ventureooventureoo
committed
Make real debug packages with makepkg
1 parent 7804c31 commit 4fcf071

File tree

11 files changed

+11
-352
lines changed

11 files changed

+11
-352
lines changed

‎linux-cachyos-bore/PKGBUILD

+1-32
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,6 @@ _build_nvidia=${_build_nvidia-}
141141
# Use this only if you have Turing+ GPU
142142
_build_nvidia_open=${_build_nvidia_open-}
143143

144-
# Build a debug package with non-stripped vmlinux
145-
_build_debug=${_build_debug-}
146-
147144
if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] && [ "$_use_lto_suffix" = "y" ]; then
148145
pkgsuffix=cachyos-${_cpusched}-lto
149146
pkgbase=linux-$pkgsuffix
@@ -168,7 +165,7 @@ _kernver=$pkgver-$pkgrel
168165
arch=('x86_64' 'x86_64_v3')
169166
url="https://github.com/CachyOS/linux-cachyos"
170167
license=('GPL-2.0-only')
171-
options=('!strip' '!debug' '!lto')
168+
options=('!lto')
172169
makedepends=('bc' 'libelf' 'pahole' 'cpio' 'perl' 'tar' 'xz' 'zstd' 'gcc' 'gcc-libs' 'glibc' 'binutils' 'make' 'patch' 'python')
173170
# LLVM makedepends
174171
if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] || [ -n "$_use_kcfi" ]; then
@@ -666,38 +663,11 @@ _package-headers() {
666663
echo "Removing loose objects..."
667664
find "$builddir" -type f -name '*.o' -printf 'Removing %P\n' -delete
668665

669-
echo "Stripping build tools..."
670-
local file
671-
while read -rd '' file; do
672-
case "$(file -Sib "$file")" in
673-
application/x-sharedlib\;*) # Libraries (.so)
674-
strip -v $STRIP_SHARED "$file" ;;
675-
application/x-archive\;*) # Libraries (.a)
676-
strip -v $STRIP_STATIC "$file" ;;
677-
application/x-executable\;*) # Binaries
678-
strip -v $STRIP_BINARIES "$file" ;;
679-
application/x-pie-executable\;*) # Relocatable binaries
680-
strip -v $STRIP_SHARED "$file" ;;
681-
esac
682-
done < <(find "$builddir" -type f -perm -u+x ! -name vmlinux -print0)
683-
684-
echo "Stripping vmlinux..."
685-
strip -v $STRIP_STATIC "$builddir/vmlinux"
686-
687666
echo "Adding symlink..."
688667
mkdir -p "$pkgdir/usr/src"
689668
ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
690669
}
691670

692-
_package-dbg(){
693-
pkgdesc="Non-stripped vmlinux file for the $pkgdesc kernel"
694-
depends=(linux-${pkgsuffix}-headers)
695-
696-
cd "${srcdir}/${_srcname}"
697-
mkdir -p "$pkgdir/usr/src/debug/linux-${pkgsuffix}"
698-
install -Dt "$pkgdir/usr/src/debug/linux-${pkgsuffix}" -m644 vmlinux
699-
}
700-
701671
_package-zfs(){
702672
pkgdesc="zfs module for the $pkgdesc kernel"
703673
depends=('pahole' $pkgbase=$_kernver)
@@ -739,7 +709,6 @@ _package-nvidia-open(){
739709
}
740710

741711
pkgname=("$pkgbase")
742-
[ -n "$_build_debug" ] && pkgname+=("$pkgbase-dbg")
743712
pkgname+=("$pkgbase-headers")
744713
[ -n "$_build_zfs" ] && pkgname+=("$pkgbase-zfs")
745714
[ -n "$_build_nvidia" ] && pkgname+=("$pkgbase-nvidia")

‎linux-cachyos-deckify/PKGBUILD

+1-32
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,6 @@ _build_nvidia=${_build_nvidia-}
141141
# Use this only if you have Turing+ GPU
142142
_build_nvidia_open=${_build_nvidia_open-}
143143

144-
# Build a debug package with non-stripped vmlinux
145-
_build_debug=${_build_debug-}
146-
147144
if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] && [ "$_use_lto_suffix" = "y" ]; then
148145
pkgsuffix=cachyos-deckify-lto
149146
pkgbase=linux-$pkgsuffix
@@ -168,7 +165,7 @@ _kernver=$pkgver-$pkgrel
168165
arch=('x86_64' 'x86_64_v3')
169166
url="https://github.com/CachyOS/linux-cachyos"
170167
license=('GPL-2.0-only')
171-
options=('!strip' '!debug' '!lto')
168+
options=('!lto')
172169
makedepends=('bc' 'libelf' 'pahole' 'cpio' 'perl' 'tar' 'xz' 'zstd' 'gcc' 'gcc-libs' 'glibc' 'binutils' 'make' 'patch' 'python')
173170
# LLVM makedepends
174171
if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] || [ -n "$_use_kcfi" ]; then
@@ -668,38 +665,11 @@ _package-headers() {
668665
echo "Removing loose objects..."
669666
find "$builddir" -type f -name '*.o' -printf 'Removing %P\n' -delete
670667

671-
echo "Stripping build tools..."
672-
local file
673-
while read -rd '' file; do
674-
case "$(file -Sib "$file")" in
675-
application/x-sharedlib\;*) # Libraries (.so)
676-
strip -v $STRIP_SHARED "$file" ;;
677-
application/x-archive\;*) # Libraries (.a)
678-
strip -v $STRIP_STATIC "$file" ;;
679-
application/x-executable\;*) # Binaries
680-
strip -v $STRIP_BINARIES "$file" ;;
681-
application/x-pie-executable\;*) # Relocatable binaries
682-
strip -v $STRIP_SHARED "$file" ;;
683-
esac
684-
done < <(find "$builddir" -type f -perm -u+x ! -name vmlinux -print0)
685-
686-
echo "Stripping vmlinux..."
687-
strip -v $STRIP_STATIC "$builddir/vmlinux"
688-
689668
echo "Adding symlink..."
690669
mkdir -p "$pkgdir/usr/src"
691670
ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
692671
}
693672

694-
_package-dbg(){
695-
pkgdesc="Non-stripped vmlinux file for the $pkgdesc kernel"
696-
depends=(linux-${pkgsuffix}-headers)
697-
698-
cd "${srcdir}/${_srcname}"
699-
mkdir -p "$pkgdir/usr/src/debug/linux-${pkgsuffix}"
700-
install -Dt "$pkgdir/usr/src/debug/linux-${pkgsuffix}" -m644 vmlinux
701-
}
702-
703673
_package-zfs(){
704674
pkgdesc="zfs module for the $pkgdesc kernel"
705675
depends=('pahole' $pkgbase=$_kernver)
@@ -741,7 +711,6 @@ _package-nvidia-open(){
741711
}
742712

743713
pkgname=("$pkgbase")
744-
[ -n "$_build_debug" ] && pkgname+=("$pkgbase-dbg")
745714
pkgname+=("$pkgbase-headers")
746715
[ -n "$_build_zfs" ] && pkgname+=("$pkgbase-zfs")
747716
[ -n "$_build_nvidia" ] && pkgname+=("$pkgbase-nvidia")

‎linux-cachyos-echo/PKGBUILD

+1-32
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,6 @@ _build_nvidia=${_build_nvidia-}
141141
# Use this only if you have Turing+ GPU
142142
_build_nvidia_open=${_build_nvidia_open-}
143143

144-
# Build a debug package with non-stripped vmlinux
145-
_build_debug=${_build_debug-}
146-
147144
if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] && [ "$_use_lto_suffix" = "y" ]; then
148145
pkgsuffix=cachyos-${_cpusched}-lto
149146
pkgbase=linux-$pkgsuffix
@@ -168,7 +165,7 @@ _kernver=$pkgver-$pkgrel
168165
arch=('x86_64' 'x86_64_v3')
169166
url="https://github.com/CachyOS/linux-cachyos"
170167
license=('GPL-2.0-only')
171-
options=('!strip' '!debug' '!lto')
168+
options=('!lto')
172169
makedepends=('bc' 'libelf' 'pahole' 'cpio' 'perl' 'tar' 'xz' 'zstd' 'gcc' 'gcc-libs' 'glibc' 'binutils' 'make' 'patch' 'python')
173170
# LLVM makedepends
174171
if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] || [ -n "$_use_kcfi" ]; then
@@ -666,38 +663,11 @@ _package-headers() {
666663
echo "Removing loose objects..."
667664
find "$builddir" -type f -name '*.o' -printf 'Removing %P\n' -delete
668665

669-
echo "Stripping build tools..."
670-
local file
671-
while read -rd '' file; do
672-
case "$(file -Sib "$file")" in
673-
application/x-sharedlib\;*) # Libraries (.so)
674-
strip -v $STRIP_SHARED "$file" ;;
675-
application/x-archive\;*) # Libraries (.a)
676-
strip -v $STRIP_STATIC "$file" ;;
677-
application/x-executable\;*) # Binaries
678-
strip -v $STRIP_BINARIES "$file" ;;
679-
application/x-pie-executable\;*) # Relocatable binaries
680-
strip -v $STRIP_SHARED "$file" ;;
681-
esac
682-
done < <(find "$builddir" -type f -perm -u+x ! -name vmlinux -print0)
683-
684-
echo "Stripping vmlinux..."
685-
strip -v $STRIP_STATIC "$builddir/vmlinux"
686-
687666
echo "Adding symlink..."
688667
mkdir -p "$pkgdir/usr/src"
689668
ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
690669
}
691670

692-
_package-dbg(){
693-
pkgdesc="Non-stripped vmlinux file for the $pkgdesc kernel"
694-
depends=(linux-${pkgsuffix}-headers)
695-
696-
cd "${srcdir}/${_srcname}"
697-
mkdir -p "$pkgdir/usr/src/debug/linux-${pkgsuffix}"
698-
install -Dt "$pkgdir/usr/src/debug/linux-${pkgsuffix}" -m644 vmlinux
699-
}
700-
701671
_package-zfs(){
702672
pkgdesc="zfs module for the $pkgdesc kernel"
703673
depends=('pahole' $pkgbase=$_kernver)
@@ -739,7 +709,6 @@ _package-nvidia-open(){
739709
}
740710

741711
pkgname=("$pkgbase")
742-
[ -n "$_build_debug" ] && pkgname+=("$pkgbase-dbg")
743712
pkgname+=("$pkgbase-headers")
744713
[ -n "$_build_zfs" ] && pkgname+=("$pkgbase-zfs")
745714
[ -n "$_build_nvidia" ] && pkgname+=("$pkgbase-nvidia")

‎linux-cachyos-eevdf/PKGBUILD

+1-32
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,6 @@ _build_nvidia=${_build_nvidia-}
141141
# Use this only if you have Turing+ GPU
142142
_build_nvidia_open=${_build_nvidia_open-}
143143

144-
# Build a debug package with non-stripped vmlinux
145-
_build_debug=${_build_debug-}
146-
147144
if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] && [ "$_use_lto_suffix" = "y" ]; then
148145
pkgsuffix=cachyos-${_cpusched}-lto
149146
pkgbase=linux-$pkgsuffix
@@ -168,7 +165,7 @@ _kernver=$pkgver-$pkgrel
168165
arch=('x86_64' 'x86_64_v3')
169166
url="https://github.com/CachyOS/linux-cachyos"
170167
license=('GPL-2.0-only')
171-
options=('!strip' '!debug' '!lto')
168+
options=('!lto')
172169
makedepends=('bc' 'libelf' 'pahole' 'cpio' 'perl' 'tar' 'xz' 'zstd' 'gcc' 'gcc-libs' 'glibc' 'binutils' 'make' 'patch' 'python')
173170
# LLVM makedepends
174171
if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] || [ -n "$_use_kcfi" ]; then
@@ -666,38 +663,11 @@ _package-headers() {
666663
echo "Removing loose objects..."
667664
find "$builddir" -type f -name '*.o' -printf 'Removing %P\n' -delete
668665

669-
echo "Stripping build tools..."
670-
local file
671-
while read -rd '' file; do
672-
case "$(file -Sib "$file")" in
673-
application/x-sharedlib\;*) # Libraries (.so)
674-
strip -v $STRIP_SHARED "$file" ;;
675-
application/x-archive\;*) # Libraries (.a)
676-
strip -v $STRIP_STATIC "$file" ;;
677-
application/x-executable\;*) # Binaries
678-
strip -v $STRIP_BINARIES "$file" ;;
679-
application/x-pie-executable\;*) # Relocatable binaries
680-
strip -v $STRIP_SHARED "$file" ;;
681-
esac
682-
done < <(find "$builddir" -type f -perm -u+x ! -name vmlinux -print0)
683-
684-
echo "Stripping vmlinux..."
685-
strip -v $STRIP_STATIC "$builddir/vmlinux"
686-
687666
echo "Adding symlink..."
688667
mkdir -p "$pkgdir/usr/src"
689668
ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
690669
}
691670

692-
_package-dbg(){
693-
pkgdesc="Non-stripped vmlinux file for the $pkgdesc kernel"
694-
depends=(linux-${pkgsuffix}-headers)
695-
696-
cd "${srcdir}/${_srcname}"
697-
mkdir -p "$pkgdir/usr/src/debug/linux-${pkgsuffix}"
698-
install -Dt "$pkgdir/usr/src/debug/linux-${pkgsuffix}" -m644 vmlinux
699-
}
700-
701671
_package-zfs(){
702672
pkgdesc="zfs module for the $pkgdesc kernel"
703673
depends=('pahole' $pkgbase=$_kernver)
@@ -739,7 +709,6 @@ _package-nvidia-open(){
739709
}
740710

741711
pkgname=("$pkgbase")
742-
[ -n "$_build_debug" ] && pkgname+=("$pkgbase-dbg")
743712
pkgname+=("$pkgbase-headers")
744713
[ -n "$_build_zfs" ] && pkgname+=("$pkgbase-zfs")
745714
[ -n "$_build_nvidia" ] && pkgname+=("$pkgbase-nvidia")

‎linux-cachyos-hardened/PKGBUILD

+1-32
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,6 @@ _build_nvidia=${_build_nvidia-}
141141
# Use this only if you have Turing+ GPU
142142
_build_nvidia_open=${_build_nvidia_open-}
143143

144-
# Build a debug package with non-stripped vmlinux
145-
_build_debug=${_build_debug-}
146-
147144
if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] && [ "$_use_lto_suffix" = "y" ]; then
148145
pkgsuffix=cachyos-${_cpusched}-lto
149146
pkgbase=linux-$pkgsuffix
@@ -168,7 +165,7 @@ _kernver=$pkgver-$pkgrel
168165
arch=('x86_64' 'x86_64_v3')
169166
url="https://github.com/CachyOS/linux-cachyos"
170167
license=('GPL-2.0-only')
171-
options=('!strip' '!debug' '!lto')
168+
options=('!lto')
172169
makedepends=('bc' 'libelf' 'pahole' 'cpio' 'perl' 'tar' 'xz' 'zstd' 'gcc' 'gcc-libs' 'glibc' 'binutils' 'make' 'patch' 'python')
173170
# LLVM makedepends
174171
if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] || [ -n "$_use_kcfi" ]; then
@@ -665,38 +662,11 @@ _package-headers() {
665662
echo "Removing loose objects..."
666663
find "$builddir" -type f -name '*.o' -printf 'Removing %P\n' -delete
667664

668-
echo "Stripping build tools..."
669-
local file
670-
while read -rd '' file; do
671-
case "$(file -Sib "$file")" in
672-
application/x-sharedlib\;*) # Libraries (.so)
673-
strip -v $STRIP_SHARED "$file" ;;
674-
application/x-archive\;*) # Libraries (.a)
675-
strip -v $STRIP_STATIC "$file" ;;
676-
application/x-executable\;*) # Binaries
677-
strip -v $STRIP_BINARIES "$file" ;;
678-
application/x-pie-executable\;*) # Relocatable binaries
679-
strip -v $STRIP_SHARED "$file" ;;
680-
esac
681-
done < <(find "$builddir" -type f -perm -u+x ! -name vmlinux -print0)
682-
683-
echo "Stripping vmlinux..."
684-
strip -v $STRIP_STATIC "$builddir/vmlinux"
685-
686665
echo "Adding symlink..."
687666
mkdir -p "$pkgdir/usr/src"
688667
ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
689668
}
690669

691-
_package-dbg(){
692-
pkgdesc="Non-stripped vmlinux file for the $pkgdesc kernel"
693-
depends=(linux-${pkgsuffix}-headers)
694-
695-
cd "${srcdir}/${_srcname}"
696-
mkdir -p "$pkgdir/usr/src/debug/linux-${pkgsuffix}"
697-
install -Dt "$pkgdir/usr/src/debug/linux-${pkgsuffix}" -m644 vmlinux
698-
}
699-
700670
_package-zfs(){
701671
pkgdesc="zfs module for the $pkgdesc kernel"
702672
depends=('pahole' $pkgbase=$_kernver)
@@ -738,7 +708,6 @@ _package-nvidia-open(){
738708
}
739709

740710
pkgname=("$pkgbase")
741-
[ -n "$_build_debug" ] && pkgname+=("$pkgbase-dbg")
742711
pkgname+=("$pkgbase-headers")
743712
[ -n "$_build_zfs" ] && pkgname+=("$pkgbase-zfs")
744713
[ -n "$_build_nvidia" ] && pkgname+=("$pkgbase-nvidia")

‎linux-cachyos-lts/PKGBUILD

+1-32
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,6 @@ _bcachefs=${_bcachefs-}
161161
# Use this only if you have Turing+ GPU
162162
_build_nvidia_open=${_build_nvidia_open-}
163163

164-
# Build a debug package with non-stripped vmlinux
165-
_build_debug=${_build_debug-}
166-
167164
if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] && [ "$_use_lto_suffix" = "y" ]; then
168165
pkgsuffix=cachyos-lts-lto
169166
pkgbase=linux-$pkgsuffix
@@ -188,7 +185,7 @@ _kernver=$pkgver-$pkgrel
188185
arch=('x86_64' 'x86_64_v3')
189186
url="https://github.com/CachyOS/linux-cachyos"
190187
license=('GPL-2.0-only')
191-
options=('!strip' '!debug' '!lto')
188+
options=('!lto')
192189
makedepends=('bc' 'libelf' 'pahole' 'cpio' 'perl' 'tar' 'xz' 'zstd' 'gcc' 'gcc-libs' 'glibc' 'binutils' 'make' 'patch' 'python')
193190
# LLVM makedepends
194191
if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] || [ -n "$_use_kcfi" ]; then
@@ -734,38 +731,11 @@ _package-headers() {
734731
echo "Removing loose objects..."
735732
find "$builddir" -type f -name '*.o' -printf 'Removing %P\n' -delete
736733

737-
echo "Stripping build tools..."
738-
local file
739-
while read -rd '' file; do
740-
case "$(file -Sib "$file")" in
741-
application/x-sharedlib\;*) # Libraries (.so)
742-
strip -v $STRIP_SHARED "$file" ;;
743-
application/x-archive\;*) # Libraries (.a)
744-
strip -v $STRIP_STATIC "$file" ;;
745-
application/x-executable\;*) # Binaries
746-
strip -v $STRIP_BINARIES "$file" ;;
747-
application/x-pie-executable\;*) # Relocatable binaries
748-
strip -v $STRIP_SHARED "$file" ;;
749-
esac
750-
done < <(find "$builddir" -type f -perm -u+x ! -name vmlinux -print0)
751-
752-
echo "Stripping vmlinux..."
753-
strip -v $STRIP_STATIC "$builddir/vmlinux"
754-
755734
echo "Adding symlink..."
756735
mkdir -p "$pkgdir/usr/src"
757736
ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
758737
}
759738

760-
_package-dbg(){
761-
pkgdesc="Non-stripped vmlinux file for the $pkgdesc kernel"
762-
depends=(linux-${pkgsuffix}-headers)
763-
764-
cd "${srcdir}/${_srcname}"
765-
mkdir -p "$pkgdir/usr/src/debug/linux-${pkgsuffix}"
766-
install -Dt "$pkgdir/usr/src/debug/linux-${pkgsuffix}" -m644 vmlinux
767-
}
768-
769739
_package-zfs(){
770740
pkgdesc="zfs module for the $pkgdesc kernel"
771741
depends=('pahole' $pkgbase=$_kernver)
@@ -807,7 +777,6 @@ _package-nvidia-open(){
807777
}
808778

809779
pkgname=("$pkgbase")
810-
[ -n "$_build_debug" ] && pkgname+=("$pkgbase-dbg")
811780
pkgname+=("$pkgbase-headers")
812781
[ -n "$_build_zfs" ] && pkgname+=("$pkgbase-zfs")
813782
[ -n "$_build_nvidia" ] && pkgname+=("$pkgbase-nvidia")

0 commit comments

Comments
 (0)