pkg-dist.mk, pkg.sh: Rename PCKG variables to PKG
All checks were successful
CI / Packaging - Kali Linux (pull_request) Successful in 7m1s
CI / Packaging - OpenSUSE Tumbleweed (pull_request) Successful in 5m3s
CI / Packaging test (pull_request) Successful in 0s
CI / Packaging - Kali Linux (push) Successful in 5m46s
CI / Packaging - OpenSUSE Tumbleweed (push) Successful in 4m51s
CI / Packaging test (push) Successful in 0s
All checks were successful
CI / Packaging - Kali Linux (pull_request) Successful in 7m1s
CI / Packaging - OpenSUSE Tumbleweed (pull_request) Successful in 5m3s
CI / Packaging test (pull_request) Successful in 0s
CI / Packaging - Kali Linux (push) Successful in 5m46s
CI / Packaging - OpenSUSE Tumbleweed (push) Successful in 4m51s
CI / Packaging test (push) Successful in 0s
The previous commit renamed the dist/pckg directory to dist/pkg but kept the pckg spelling in the variables that reference it. Rename the variables to PKG: - DIST_PCKG_DIR to DIST_PKG_DIR (make/pkg-dist.mk, pkg.sh) - PCKG_TAR to PKG_TAR, PCKG_ROOT to PKG_ROOT and DIST_PCKG_RPM to DIST_PKG_RPM (make/pkg-dist.mk) None of the other 320 janware projects use these variables. Assisted-by: unsloth/Qwen3.8-27B-GGUF:Q4_K_M with pi.dev v0.87.0 Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
parent
29dffb9767
commit
f92de9f3ff
3 changed files with 28 additions and 28 deletions
|
|
@ -253,8 +253,8 @@ check_pkg_reinstall()
|
|||
;;
|
||||
esac
|
||||
|
||||
check_pkg_install $TOPDIR/$DIST_PCKG_DIR/$PKG_PROJECT-run$suffix || return 1
|
||||
check_pkg_install -c $TOPDIR/$DIST_PCKG_DIR/$PKG_PROJECT-devel$suffix || return 1;
|
||||
check_pkg_install $TOPDIR/$DIST_PKG_DIR/$PKG_PROJECT-run$suffix || return 1
|
||||
check_pkg_install -c $TOPDIR/$DIST_PKG_DIR/$PKG_PROJECT-devel$suffix || return 1;
|
||||
}
|
||||
|
||||
check_release_is_current()
|
||||
|
|
@ -517,9 +517,9 @@ build_pkg()
|
|||
done
|
||||
|
||||
# --- tar up source directory tree
|
||||
create_empty_dir $DIST_PCKG_DIR "Package directory"
|
||||
create_empty_dir $DIST_PKG_DIR "Package directory"
|
||||
|
||||
tar --anchored -czvf $DIST_PCKG_DIR/$tar_archive -C $DIST_SRC_DIR `basename $src_tree`
|
||||
tar --anchored -czvf $DIST_PKG_DIR/$tar_archive -C $DIST_SRC_DIR `basename $src_tree`
|
||||
|
||||
case "$PKG_FORMAT" in
|
||||
rpm)
|
||||
|
|
@ -529,13 +529,13 @@ build_pkg()
|
|||
rpmbuild_root=$(readlink -f $rpmbuild_root)
|
||||
local rpmbuild_srpms=$rpmbuild_root/SRPMS
|
||||
local rpmbuild_rpms=$rpmbuild_root/RPMS/$PKG_ARCH
|
||||
rpmbuild --define "_topdir $rpmbuild_root" -ta $DIST_PCKG_DIR/$tar_archive
|
||||
cp $rpmbuild_srpms/$src_base.src.rpm $DIST_PCKG_DIR/
|
||||
cp $rpmbuild_rpms/$PKG_PROJECT-*-$version.$PKG_ARCH.rpm $DIST_PCKG_DIR/
|
||||
rpmbuild --define "_topdir $rpmbuild_root" -ta $DIST_PKG_DIR/$tar_archive
|
||||
cp $rpmbuild_srpms/$src_base.src.rpm $DIST_PKG_DIR/
|
||||
cp $rpmbuild_rpms/$PKG_PROJECT-*-$version.$PKG_ARCH.rpm $DIST_PKG_DIR/
|
||||
;;
|
||||
*)
|
||||
#exit
|
||||
#cp $DIST_PCKG_DIR/$tar_archive $src_tree/../$tar_archive_orig
|
||||
#cp $DIST_PKG_DIR/$tar_archive $src_tree/../$tar_archive_orig
|
||||
(
|
||||
local mod_script_dir=`readlink -f $JWB_SCRIPT_DIR`
|
||||
cd $src_tree
|
||||
|
|
@ -544,7 +544,7 @@ build_pkg()
|
|||
#strace -f -s 128 -o /tmp/strace.out debuild --no-tgz-check --prepend-path=$mod_script_dir -us -uc
|
||||
debuild --no-tgz-check --prepend-path=$mod_script_dir -us -uc
|
||||
)
|
||||
cp $DIST_SRC_DIR/*.deb $DIST_PCKG_DIR/
|
||||
cp $DIST_SRC_DIR/*.deb $DIST_PKG_DIR/
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
|
@ -558,9 +558,9 @@ upload_file()
|
|||
fi
|
||||
local f="$1"
|
||||
local t="$2"
|
||||
[ -f $DIST_PCKG_DIR/$f ] || {
|
||||
[ -f $DIST_PKG_DIR/$f ] || {
|
||||
if [ "$quiet" = true ]; then return 0; fi
|
||||
"+ $DIST_PCKG_DIR/$f doesn't exist, can't upload"
|
||||
"+ $DIST_PKG_DIR/$f doesn't exist, can't upload"
|
||||
return 1
|
||||
}
|
||||
local os_name=`get_os | sed 's/-.*//'`
|
||||
|
|
@ -600,7 +600,7 @@ upload_file()
|
|||
esac
|
||||
esac
|
||||
echo "+ uploading $target"
|
||||
RSYNC_RSH=$SSH /bin/bash $JWB_SCRIPT_DIR/upload.sh $DIST_PCKG_DIR/$f $target
|
||||
RSYNC_RSH=$SSH /bin/bash $JWB_SCRIPT_DIR/upload.sh $DIST_PKG_DIR/$f $target
|
||||
}
|
||||
|
||||
upload_pkg()
|
||||
|
|
@ -1138,7 +1138,7 @@ tmp_mkdef_sh=""
|
|||
PROJECT_DESCR_FILE=$TOPDIR/make/project.conf
|
||||
DIST_SRC_DIR=dist/src
|
||||
DIST_INST_DIR=dist/src
|
||||
DIST_PCKG_DIR=dist/pkg
|
||||
DIST_PKG_DIR=dist/pkg
|
||||
RPMBUILD_ROOT=""
|
||||
PKG_PROJECT="$PROJECT"
|
||||
PKG_REQUIRES_RUN=""
|
||||
|
|
@ -1167,7 +1167,7 @@ while [ ${1:0:1} = - ]; do
|
|||
shift
|
||||
;;
|
||||
-p)
|
||||
eval DIST_PCKG_DIR=\"$2\"
|
||||
eval DIST_PKG_DIR=\"$2\"
|
||||
shift
|
||||
;;
|
||||
-m)
|
||||
|
|
@ -1287,7 +1287,7 @@ version)
|
|||
;;
|
||||
build)
|
||||
check_cwd
|
||||
rm -rf ./$DIST_SRC_DIR ./$DIST_PCKG_DIR
|
||||
rm -rf ./$DIST_SRC_DIR ./$DIST_PKG_DIR
|
||||
cmd_build "$@"
|
||||
;;
|
||||
release-reinstall)
|
||||
|
|
@ -1301,7 +1301,7 @@ release)
|
|||
check_release_is_current -r || {
|
||||
set -e
|
||||
check_cwd
|
||||
rm -rf ./$DIST_SRC_DIR ./$DIST_PCKG_DIR
|
||||
rm -rf ./$DIST_SRC_DIR ./$DIST_PKG_DIR
|
||||
check_update_version || true
|
||||
cmd_build "$@"
|
||||
check_pkg_reinstall
|
||||
|
|
|
|||
Loading…
Reference in a new issue