Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2017-05-03 16:05:12 (GMT) |
|---|---|---|
| committer | Edwin Mons <edwin.mons@isode.com> | 2017-05-03 19:17:53 (GMT) |
| commit | dc70dbb6af039fba8f7a1cece8db4bb119deaabd (patch) | |
| tree | 8468d24ceb9bd3e639c046a9b2b08cdac3ffb755 | |
| parent | 34f1bbf1fad2eecd7f9844f76f1bc073cc34a581 (diff) | |
| download | swift-dc70dbb6af039fba8f7a1cece8db4bb119deaabd.zip swift-dc70dbb6af039fba8f7a1cece8db4bb119deaabd.tar.bz2 | |
Add workaround for adding sid packages to apt repo via reprepro
Test-Information:
Tested the changes on our repository server. It removes
the dbgsym packages, that debuild automatically builds since
sid, from the .changes file. This way reprepro will not
complain about them and add the usual packages to the repository.
Change-Id: I1e4d956ecdc76bd9256cf502bd561abcd0968252
| -rw-r--r-- | Swift/Packaging/Debian/update_debian_repo.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Swift/Packaging/Debian/update_debian_repo.sh b/Swift/Packaging/Debian/update_debian_repo.sh index 6a337fb..d62a376 100644 --- a/Swift/Packaging/Debian/update_debian_repo.sh +++ b/Swift/Packaging/Debian/update_debian_repo.sh @@ -37,61 +37,67 @@ SignWith: packages@swift.im Contents: . .gz .bz2 DebIndices: Packages Release . .gz .bz2 DscIndices: Sources Release . .gz .bz2 Codename: development Components: main Architectures: i386 amd64 source SignWith: packages@swift.im Contents: . .gz .bz2 DebIndices: Packages Release . .gz .bz2 DscIndices: Sources Release . .gz .bz2 Codename: release Components: main Architectures: i386 amd64 source SignWith: packages@swift.im Contents: . .gz .bz2 DebIndices: Packages Release . .gz .bz2 DscIndices: Sources Release . .gz .bz2 EOM } function write_reprepo_conf_incoming_to_file { cat <<EOM >$1 Name: swift IncomingDir: $2 TempDir: $APT_TEMP_DIR Allow: beta development release Multiple: Yes Cleanup: unused_files on_error -Permit: older_version +Permit: unused_files older_version EOM } # check for existence of reprepro command command -v reprepro >/dev/null 2>&1 || { echo >&2 "This script requires aptly but it's not installed. See https://www.aptly.info/ for further information. Aborting."; exit 1; } mkdir -p $APT_REPO_ROOT # distros for full_distribution_path in $INCOMING_FOLDER/{debian,ubuntu}/*; do distro_version=`basename $full_distribution_path` distro_name=$(basename `dirname $full_distribution_path`) distro_reprepro_root=${APT_REPO_ROOT}/${distro_name}/${distro_version} # ensure reprepro diretctory for this distribution version is present if [ ! -d "$distro_preprepro_root" ]; then echo "Create distribution repository for $distro_name/$distro_version" mkdir -p $distro_reprepro_root mkdir -p ${distro_reprepro_root}/conf write_reprepo_conf_distributions_to_file "${distro_reprepro_root}/conf/distributions" write_reprepo_conf_incoming_to_file "${distro_reprepro_root}/conf/incoming" "$full_distribution_path" fi + # This is workaround for https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=808558 + # and https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=843402 + if [ "$distro_name/$distro_version" = "debian/sid" ]; then + sed -i '/dbgsym/ d' $full_distribution_path/*.changes + fi + echo "Process incoming packages for $distro_name/$distro_version" #set +e reprepro -V -b ${distro_reprepro_root} processincoming swift #set -e done echo "Successfully finished updating apt repository." |