From 292a33da6bdb4b1e5f87e17b38d98b267a1bc209 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 12 Jun 2021 15:14:43 +0200 Subject: Updating. Signed-off-by: Daniel Baumann --- bin/debian-chroot | 12 ++++++------ bin/padd.sh | 2 -- bin/pbuild.sh | 19 +++++++++++++------ bin/reprepro_fix-changes.sh | 9 +++++---- 4 files changed, 24 insertions(+), 18 deletions(-) diff --git a/bin/debian-chroot b/bin/debian-chroot index 0061eaa..3aaf7b8 100755 --- a/bin/debian-chroot +++ b/bin/debian-chroot @@ -201,7 +201,7 @@ EOF cat > "${CHROOT}/build/.bash_history" << EOF cd */ && sudo apt-get build-dep -y . && dpkg-buildpackage -B && cd .. && rm -rf */ sudo apt-get install -y -t ${DERIVATIVE_DISTRIBUTION}-backports debhelper -clear && pbuild.sh -a -n -u -b binary-arch -d ${DERIVATIVE_DISTRIBUTION}-backports -p +clear && pbuild.sh -a -o -n -u -b binary-arch -d ${DERIVATIVE_DISTRIBUTION}-backports -p rsync -aPv --progress --stats * apt.progress-linux.org::upload && rm -rf * EOF @@ -212,7 +212,7 @@ EOF cat > "${CHROOT}/build/.bash_history" << EOF cd */ && sudo apt-get build-dep -y . && dpkg-buildpackage -A && cd .. && rm -rf */ sudo apt-get install -y -t ${DERIVATIVE_DISTRIBUTION}-backports debhelper -clear && pbuild.sh -a -n -u -b binary-indep -d ${DERIVATIVE_DISTRIBUTION}-backports -p +clear && pbuild.sh -a -o -n -u -b binary-indep -d ${DERIVATIVE_DISTRIBUTION}-backports -p rsync -aPv --progress --stats * apt.progress-linux.org::upload && rm -rf * EOF @@ -223,7 +223,7 @@ EOF cat > "${CHROOT}/build/.bash_history" << EOF cd */ && sudo apt-get build-dep -y . && dpkg-buildpackage -A && cd .. && rm -rf */ sudo apt-get install -y -t ${DERIVATIVE_DISTRIBUTION}-backports debhelper -clear && pbuild.sh -u -b source -d ${DERIVATIVE_DISTRIBUTION}-backports -p +clear && pbuild.sh -o -u -b source -d ${DERIVATIVE_DISTRIBUTION}-backports -p rsync -aPv --progress --stats * apt.progress-linux.org::upload && rm -rf * EOF @@ -292,7 +292,7 @@ EOF cat > "${CHROOT}/build/.bash_history" << EOF cd */ && sudo apt-get build-dep -y . && dpkg-buildpackage -B && cd .. && rm -rf */ sudo apt-get install -y -t ${DERIVATIVE_DISTRIBUTION}-backports debhelper -clear && pbuild.sh -a -n -u -b binary-arch -d ${DERIVATIVE_DISTRIBUTION}-backports -p +clear && pbuild.sh -a -o -n -u -b binary-arch -d ${DERIVATIVE_DISTRIBUTION}-backports -p rsync -aPv --progress --stats * apt.progress-linux.org::upload && rm -rf * EOF @@ -303,7 +303,7 @@ EOF cat > "${CHROOT}/build/.bash_history" << EOF cd */ && sudo apt-get build-dep -y . && dpkg-buildpackage -A && cd .. && rm -rf */ sudo apt-get install -y -t ${DERIVATIVE_DISTRIBUTION}-backports debhelper -clear && pbuild.sh -a -n -u -b binary-indep -d ${DERIVATIVE_DISTRIBUTION}-backports -p +clear && pbuild.sh -a -o -n -u -b binary-indep -d ${DERIVATIVE_DISTRIBUTION}-backports -p rsync -aPv --progress --stats * apt.progress-linux.org::upload && rm -rf * EOF @@ -314,7 +314,7 @@ EOF cat > "${CHROOT}/build/.bash_history" << EOF cd */ && sudo apt-get build-dep -y . && dpkg-buildpackage -A && cd .. && rm -rf */ sudo apt-get install -y -t ${DERIVATIVE_DISTRIBUTION}-backports debhelper -clear && pbuild.sh -u -b source -d ${DERIVATIVE_DISTRIBUTION}-backports -p +clear && pbuild.sh -o -u -b source -d ${DERIVATIVE_DISTRIBUTION}-backports -p rsync -aPv --progress --stats * apt.progress-linux.org::upload && rm -rf * EOF ;; diff --git a/bin/padd.sh b/bin/padd.sh index c561fc6..b5e9778 100755 --- a/bin/padd.sh +++ b/bin/padd.sh @@ -76,8 +76,6 @@ case "$(basename ${PWD})" in ;; esac -#_DIST="$(cd ../../../ && echo $(basename ${PWD}))" - case "${_ARCH}" in source) #_DIST="$(grep -m1 '^Distribution: ' *.dsc | awk '{ print $2 }')" diff --git a/bin/pbuild.sh b/bin/pbuild.sh index 69d379e..49c5242 100755 --- a/bin/pbuild.sh +++ b/bin/pbuild.sh @@ -184,6 +184,11 @@ do fi fi + if [ -n "${TAG}" ] + then + VERSION="$(echo ${TAG} | awk -F/ '{ print $2 }' | sed -e 's|%|:|g' -e 's|_|~|g')" + fi + for BUILD in $(echo ${BUILD} | sed -e 's|,| |g') do echo "################################################################################" @@ -285,8 +290,8 @@ do true) FILES="$(sed -e '1,/^Files:$/ d' ${TARGET}_${SOURCE_VERSION}.dsc | sed -e '/^[0-1a-zA-Z]/,$d' | awk '{ print $3 }')" - rsync -aP "${FILES}" ${TARGET}_${SOURCE_VERSION}.dsc apt.progress-linux.org::upload - rm -f "${FILES}" ${TARGET}_${SOURCE_VERSION}.dsc + rsync -aP ${FILES} ${TARGET}_${SOURCE_VERSION}.dsc apt.progress-linux.org::upload + rm -f ${FILES} ${TARGET}_${SOURCE_VERSION}.dsc ;; esac ;; @@ -345,15 +350,17 @@ do case "${NOCHECK}" in true) + export DEB_BUILD_OPTIONS="${DEB_BUILD_OPTIONS} nocheck" + # disable tests - for RULE in dh_auto_test dh_auto_test-arch dh_auto_test-indep \ + for RULE in dh_auto_test dh_auto_test-arch dh_auto_test-indep \ override_dh_auto_test override_dh_auto_test-arch override_dh_auto_test-indep \ execute_before_dh_auto_test execute_before_dh_auto_test-arch execute_before_dh_auto_test-indep \ execute_after_dh_auto_test execute_after_dh_auto_test-arch execute_after_dh_auto_test-indep do if grep -qs "^${RULE}:" debian/rules then - sed -i -e "s|^${RULE}:|disabled_${RULE}:|" debian/rules + sed -i -e "s|^${RULE}:|nocheck_${RULE}:|" debian/rules else echo "${RULE}:" >> debian/rules fi @@ -407,8 +414,8 @@ do true) FILES="$(sed -e '1,/^Files:$/ d' ${TARGET}_${SOURCE_VERSION}_*.changes | sed -e '/^[0-1a-zA-Z]/,$d' | awk '{ print $5 }')" - rsync -aP "${FILES}" ${TARGET}_${SOURCE_VERSION}_*.changes - rm -f "${FILES}" ${TARGET}_${SOURCE_VERSION}_*.changes + rsync -aP ${FILES} ${TARGET}_${SOURCE_VERSION}_*.changes apt.progress-linux.org::upload + rm -f ${FILES} ${TARGET}_${SOURCE_VERSION}_*.changes ;; esac ;; diff --git a/bin/reprepro_fix-changes.sh b/bin/reprepro_fix-changes.sh index cc89489..53dd94e 100755 --- a/bin/reprepro_fix-changes.sh +++ b/bin/reprepro_fix-changes.sh @@ -32,7 +32,7 @@ Fix_size () fi } -Fix_hashsums () +Fix_checksums () { CHANGES="${1}" BUILDINFO="${2}" @@ -93,6 +93,7 @@ do fi DIRECTORY="$(basename ${BUILDINFO} | awk -F_ '{ print $1, $2 }' | sed -e 's| |-|' -e 's|~|_|g' -e 's|+|.|g')" + if ! grep -qs "Build-Path: /build/${DIRECTORY}|" "${BUILDINFO}" then echo "${CHANGES}: fix buildinfo build-path" @@ -119,7 +120,7 @@ do then echo echo "${CHANGES}: fix buildinfo sha1" - Fix_hashsums ${CHANGES} ${BUILDINFO} ${SIZE} + Fix_checksums ${CHANGES} ${BUILDINFO} ${SIZE} fi SHA256SUM="$(sha256sum ${BUILDINFO} | awk '{ print $1 }')" @@ -128,7 +129,7 @@ do then echo echo "${CHANGES}: fix buildinfo sha256" - Fix_hashsums ${CHANGES} ${BUILDINFO} ${SIZE} + Fix_checksums ${CHANGES} ${BUILDINFO} ${SIZE} fi MD5SUM="$(md5sum ${BUILDINFO} | awk '{ print $1 }')" @@ -137,7 +138,7 @@ do then echo echo "${CHANGES}: fix buildinfo md5" - Fix_hashsums ${CHANGES} ${BUILDINFO} ${SIZE} + Fix_checksums ${CHANGES} ${BUILDINFO} ${SIZE} fi echo -n "." -- cgit v1.2.3