janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 03:53:32 +01:00
Code Activity

fix: Ytools build wasn't self-contained, i.e. pkg.sh was not found from source

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2016-02-02 15:56:06 +00:00
commit 07dac74d87
3 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/create-mkdebian.sh
View file

@ -105,7 +105,7 @@ override_dh_auto_install:
mkdir -p \`dirname \$INSTALL_LOG\` mkdir -p \`dirname \$INSTALL_LOG\`
> \$INSTALL_LOG > \$INSTALL_LOG
\\\$(MAKE) ENV_PREFIX=\\\$(ENV_PREFIX) INSTALL_LOG=\\\$(INSTALL_LOG) install \\\$(MAKE) ENV_PREFIX=\\\$(ENV_PREFIX) INSTALL_LOG=\\\$(INSTALL_LOG) install
/bin/bash $dir/pkg.sh milk-install-log -p \\\$(ENV_PREFIX) -n \\\$(NAME) -t deb \$INSTALL_LOG \\\$(DEB_DIR) PATH=$MOD_SCRIPT_DIR:\\$(PATH) /bin/bash pkg.sh milk-install-log -p \\\$(ENV_PREFIX) -n \\\$(NAME) -t deb \$INSTALL_LOG \\\$(DEB_DIR)
dh_installdirs dh_installdirs
override_dh_shlibdeps: override_dh_shlibdeps:

4
scripts/create-mkspec.sh
View file

@ -50,6 +50,7 @@ ini_value global.subpackages | grep -q run && _cat << EOT
|echo "%prep -n \$NAME-run" |echo "%prep -n \$NAME-run"
|echo "" |echo ""
EOT EOT
_cat << EOT _cat << EOT
|echo "%setup -q -n \$NAME-\$V" |echo "%setup -q -n \$NAME-\$V"
|echo "" |echo ""
@ -65,7 +66,8 @@ _cat << EOT
|echo "mkdir -p \`dirname \$INSTALL_LOG\`" |echo "mkdir -p \`dirname \$INSTALL_LOG\`"
|echo "> \$INSTALL_LOG" |echo "> \$INSTALL_LOG"
|echo "make install" |echo "make install"
|echo "/bin/bash $dir/pkg.sh milk-install-log -p \\\$ENV_PREFIX -n \$NAME -t rpm \$INSTALL_LOG \`dirname \$INSTALL_LOG\`" |echo "export PATH=$MOD_SCRIPT_DIR:\\\$PATH"
|echo "/bin/bash pkg.sh milk-install-log -p \\\$ENV_PREFIX -n \$NAME -t rpm \$INSTALL_LOG \`dirname \$INSTALL_LOG\`"
|echo "" |echo ""
EOT EOT
ini_value global.subpackages | grep -q run && _cat << EOT ini_value global.subpackages | grep -q run && _cat << EOT

11
scripts/pkg.sh
View file

@ -412,6 +412,8 @@ build_pkg()
local deffmt local deffmt
case $pkgfmt in case $pkgfmt in
rpm) rpm)
# historical mess:
# pkg.sh -> mkspec_wrapper.sh -> create-mkspec.sh -> mkspec.sh -> spec -> rpmbuild spec > /var/tmp/xy.sh -> pkg.sh milk-install-log
deffmt=spec;; deffmt=spec;;
debian|deb) debian|deb)
deffmt=debian;; deffmt=debian;;
@ -432,7 +434,7 @@ build_pkg()
fatal "Failed to read project description file \"$PROJECT_DESCR_FILE\"." fatal "Failed to read project description file \"$PROJECT_DESCR_FILE\"."
[ ! -r "$create_mkdef_sh" ] && \ [ ! -r "$create_mkdef_sh" ] && \
fatal "Failed to read package build definition creation script \"$create_mkdef_sh\"." fatal "Failed to read package build definition creation script \"$create_mkdef_sh\"."
/bin/bash $create_mkdef_sh $PROJECT_DESCR_FILE > $mkdef_sh.tmp PATH=$MOD_SCRIPT_DIR:$PATH /bin/bash $create_mkdef_sh $PROJECT_DESCR_FILE > $mkdef_sh.tmp
mv $mkdef_sh.tmp $mkdef_sh mv $mkdef_sh.tmp $mkdef_sh
tmp_mkdef_sh="$tmp_mkdef_sh $mkdef_sh" tmp_mkdef_sh="$tmp_mkdef_sh $mkdef_sh"
} }
@ -442,7 +444,7 @@ build_pkg()
( (
cd $src_tree cd $src_tree
/bin/bash $mkdef_wrapper_sh $mkdef_sh \ PATH=$MOD_SCRIPT_DIR:$PATH /bin/bash $mkdef_wrapper_sh $mkdef_sh \
-V $version \ -V $version \
-S $tar_archive \ -S $tar_archive \
-N $RPM_PROJECT \ -N $RPM_PROJECT \
@ -846,7 +848,7 @@ trap goodbye SIGINT SIGKILL
# -- default values # -- default values
TOPDIR=. TOPDIR=.
MOD_SCRIPT_DIR=/opt/ytools/bin MOD_SCRIPT_DIR=`dirname $0`
CHECK_CVS_SYNC_BEFORE_RPM_RELEASE=false CHECK_CVS_SYNC_BEFORE_RPM_RELEASE=false
#LAST_RPM_VERSION=`read_map $TOPDIR/LAST_RPM_VERSION` #LAST_RPM_VERSION=`read_map $TOPDIR/LAST_RPM_VERSION`
myname=`basename $0` myname=`basename $0`
@ -928,6 +930,9 @@ while [ "$1" != -- ] ; do
done done
shift shift
export MOD_SCRIPT_DIR=`readlink -f $MOD_SCRIPT_DIR`
export PKG_SH=`readlink -f $0`
SRPMS_DIR=`find_path $HOME/rpmbuild/SRPMS /usr/src/packages/SRPMS` SRPMS_DIR=`find_path $HOME/rpmbuild/SRPMS /usr/src/packages/SRPMS`
RPMS_DIR=`find_path $HOME/rpmbuild/RPMS/$RPM_ARCH /usr/src/packages/RPMS/$RPM_ARCH` RPMS_DIR=`find_path $HOME/rpmbuild/RPMS/$RPM_ARCH /usr/src/packages/RPMS/$RPM_ARCH`