JeremyStarTM/aur-linux-clear
JeremyStarTM/aur-linux-clear
1
0
Fork 1
Code Issues Pull requests 1 Activity

Separate defconfig creation from re-use logic

Browse source 
At the moment when _use_current=y is passed to the package
compilation - the script still re-creates the defconfig which can
cause errors and cause the menuconfig to show up outta nowhere.

Fix this by bypassing the logic completely, I think that
anyone using the _use_current=y knows what they're doing
so we should be fine.
This commit is contained in:
Yaraslau Furman 2024-11-19 02:00:33 +02:00
parent 1d88158a3c
commit 7e8818327b
1 changed files with 72 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
PKGBUILD
View file

@ -152,9 +152,7 @@ export KBUILD_BUILD_HOST=archlinux
export KBUILD_BUILD_USER=${pkgbase} export KBUILD_BUILD_USER=${pkgbase}
export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
prepare() { apply_patches() {
cd "${_src_linux}" || exit 1
# Patch with kernel version patches # Patch with kernel version patches
patch -Np1 -i ../patch-${_kernel_major}.${_kernel_minor} || true patch -Np1 -i ../patch-${_kernel_major}.${_kernel_minor} || true
@ -172,7 +170,21 @@ prepare() {
patch -Np1 -i "${srcdir}/cl-linux/${i}" || true patch -Np1 -i "${srcdir}/cl-linux/${i}" || true
done done
}
copy_defconfig() {
if [[ -s /proc/config.gz ]]; then
# modprobe configs
zcat /proc/config.gz > ./.config
make ${BUILD_FLAGS[*]} olddefconfig
else
warning "Your kernel was not compiled with IKCONFIG_PROC."
warning "Unable to read kernel configuration, aborting."
exit
fi
}
create_defconfig() {
# Copy configuration file (if found) # Copy configuration file (if found)
if [ -f "${startdir}/kconfig" ]; then if [ -f "${startdir}/kconfig" ]; then
echo ":: Using configuration file \"${startdir}/kconfig\"" echo ":: Using configuration file \"${startdir}/kconfig\""
@ -270,18 +282,21 @@ prepare() {
# Ask for subarch # Ask for subarch
[[ -z "${_subarch}" ]] && make ${BUILD_FLAGS[*]} oldconfig [[ -z "${_subarch}" ]] && make ${BUILD_FLAGS[*]} oldconfig
# Optionally use the configuration of the running kernel # Open configuration editors
# Written originally by nous, see [[ -n "$_makemenuconfig" ]] && make ${BUILD_FLAGS[*]} menuconfig
# https://web.archive.org/web/20110711231356/https://aur.archlinux.org/packages.php?ID=40191 (package doesn't exist anymore) [[ -n "$_makexconfig" ]] && make ${BUILD_FLAGS[*]} xconfig
[[ -n "${_use_current}" ]] && [[ -n "$_makenconfig" ]] && make ${BUILD_FLAGS[*]} nconfig
if [[ -s /proc/config.gz ]]; then
# modprobe configs # Save configuration
zcat /proc/config.gz > ./.config [[ -n "${_copyfinalconfig}" ]] && cp -Tf ./.config "${startdir}/kconfig-new" || true
else }
warning "Your kernel was not compiled with IKCONFIG_PROC."
warning "Unable to read kernel configuration, aborting." prepare() {
exit cd "${_src_linux}" || exit 1
fi apply_patches
[[ -n "${_use_current}" ]] && copy_defconfig
[[ -z "${_use_current}" ]] && create_defconfig
# Read and apply modprobed database # Read and apply modprobed database
# See https://aur.archlinux.org/packages/modprobed-db # See https://aur.archlinux.org/packages/modprobed-db
@ -294,14 +309,6 @@ prepare() {
# Write kernel version # Write kernel version
make -s kernelrelease > version make -s kernelrelease > version
# Open configuration editors
[[ -n "$_makemenuconfig" ]] && make ${BUILD_FLAGS[*]} menuconfig
[[ -n "$_makexconfig" ]] && make ${BUILD_FLAGS[*]} xconfig
[[ -n "$_makenconfig" ]] && make ${BUILD_FLAGS[*]} nconfig
# Save configuration
[[ -n "${_copyfinalconfig}" ]] && cp -Tf ./.config "${startdir}/kconfig-new" || true
} }
build() { build() {