Browse Source

Rebase to the upstream

tags/devuan/0.14.1+devuan6
Franco Lanza 6 years ago
parent
commit
a4aae605a5
3 changed files with 33 additions and 0 deletions
  1. +22
    -0
      scripts/build-and-provide-package
  2. +5
    -0
      scripts/generate-svn-snapshot
  3. +6
    -0
      scripts/piuparts_wrapper

+ 22
- 0
scripts/build-and-provide-package View File

@@ -603,6 +603,24 @@ reprepro_wrapper() {
[ $? -eq 0 ] || bailout 1 "Error: Failed to include binary package in $REPOS repository."
}

dput_wrapper() {
command -v dput || bailout 1 "Error: dput not found."

remove_packages
remove_missing_binary_packages

archall=false
case $architecture in
all) archall=true
architecture='*' # support as file expansion in cmdline
;;
esac

echo "*** Including packages in repository $REPOS ***"
${SUDO_CMD:-} dput -U -u "${DPUT_HOST:-}" "${WORKSPACE}/binaries/"*"${newest_version}"_${architecture}.changes
[ $? -eq 0 ] || bailout 1 "Error: Failed to upload binary package to $DPUT_HOST dput host."
}

freight_ensure_repo() {
echo "*** Creating freight directory structure ***"
${SUDO_CMD:-} mkdir -p "${FREIGHT_VARCACHE}" "${FREIGHT_VARLIB}"
@@ -728,6 +746,10 @@ deploy_to_releases() {
# so this is the stage where we exit in that case.
return 0
fi
if [ -n "${USE_DPUT:-}" ] ; then
dput_wrapper
return 0
fi

if [ -n "${release:-}" ] && [ "$release" != "none" ] && [ "$release" != "trunk" ] && \
# '${release}' is a hidden bomb: when provided through predefined parameters


+ 5
- 0
scripts/generate-svn-snapshot View File

@@ -61,6 +61,11 @@ if ! [ -r debian/changelog ] ; then
exit 1
fi

# Force the upgrade. Otherwise, if the system has been upgraded, the 'svn info'
# will fail with an unhelpful error message
echo "*** Executing 'svn upgrade' to make sure svn is up2date ***"
svn upgrade

SINCE_REVISION=$(svn info debian/changelog 2>/dev/null | awk '/Last Changed Rev:/ {print $4}')

if [ -z "${SINCE_REVISION:-}" ] ; then


+ 6
- 0
scripts/piuparts_wrapper View File

@@ -38,6 +38,11 @@ else
fi
fi

if [ -n "${PIUPARTS_TMPDIR:-}" ] ; then
echo "*** PIUPARTS_TMPDIR is set to $PIUPARTS_TMPDIR - using for piuparts run ***"
piuparts_tmpdir="$PIUPARTS_TMPDIR"
fi

create_base_tgz() {
[ -r /var/cache/pbuilder/base-${distribution}-${architecture}.tgz ] && return 0

@@ -115,5 +120,6 @@ piuparts \
${skip_logrotatefiles_test_option:-} \
--log-file='piuparts.txt' \
${scriptsdir:+--scriptsdir "$scriptsdir"} \
${piuparts_tmpdir:+--tmpdir="$piuparts_tmpdir"} \
${basetgz:-} \
"$@"

Loading…
Cancel
Save