ENH make script work with BUILDDIR set in makepkg
This commit is contained in:
parent
007867d2ce
commit
b56b097982
|
@ -15,6 +15,7 @@ repo_dir=packages/linux-lts/repos/core-x86_64
|
||||||
build_dir=.build
|
build_dir=.build
|
||||||
build_file="$build_dir/PKGBUILD"
|
build_file="$build_dir/PKGBUILD"
|
||||||
hist_dir=config-history
|
hist_dir=config-history
|
||||||
|
makepkg_dir=$(sed -n 's/^BUILDDIR=\(.*\)/\1/p' /etc/makepkg.conf)
|
||||||
|
|
||||||
help="$(basename "$0") [-o] [-c] [-h]
|
help="$(basename "$0") [-o] [-c] [-h]
|
||||||
|
|
||||||
|
@ -36,7 +37,13 @@ back_up_config() {
|
||||||
echo "checking for old config file"
|
echo "checking for old config file"
|
||||||
|
|
||||||
source "$build_file" # get pkgver
|
source "$build_file" # get pkgver
|
||||||
|
|
||||||
|
# copy from the tmp dir if this is what makepkg is configured to do
|
||||||
|
if [[ "$makepkg_dir" == "" ]]; then
|
||||||
oldconf="$build_dir/src/linux-$pkgver/.config"
|
oldconf="$build_dir/src/linux-$pkgver/.config"
|
||||||
|
else
|
||||||
|
oldconf="$makepkg_dir/linux-lts-native/src/linux-$pkgver/.config"
|
||||||
|
fi
|
||||||
|
|
||||||
if [ -e "$oldconf" ]; then
|
if [ -e "$oldconf" ]; then
|
||||||
echo "found old config"
|
echo "found old config"
|
||||||
|
@ -135,10 +142,10 @@ while getopts ":och" OPT; do
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
back_up_config
|
|
||||||
update_build
|
update_build
|
||||||
|
|
||||||
cd "$build_dir" || exit
|
cd "$build_dir" || exit
|
||||||
makepkg -s -r -f -i
|
makepkg -s -r -f -i
|
||||||
cd ..
|
cd ..
|
||||||
|
|
||||||
|
back_up_config
|
||||||
|
|
Loading…
Reference in New Issue