diff options
| author | Christoph Berg | 2022-02-18 11:34:32 +0000 |
|---|---|---|
| committer | Christoph Berg | 2022-02-18 11:34:32 +0000 |
| commit | edb204a2ef2e560d95b1072e15e07040f16b0d7b (patch) | |
| tree | 73e5036f5def5e23120e1d1567fa8f66304202e4 | |
| parent | e93eac65a6466274719ddf42636a00380758f628 (diff) | |
Remove lintian from chroots
| -rw-r--r-- | debian/control | 1 | ||||
| -rwxr-xr-x | jenkins/sbuild-package | 1 | ||||
| -rwxr-xr-x | jenkins/sbuild-update.sh | 7 |
3 files changed, 2 insertions, 7 deletions
diff --git a/debian/control b/debian/control index bbfb9b3..5724b5f 100644 --- a/debian/control +++ b/debian/control @@ -29,6 +29,5 @@ Depends: ${misc:Depends}, autodep8, pkg-perl-autopkgtest, autopkgtest, newpid, sudo, gdb, - lintian, Description: metapackage to install in pgdg build chroots metapackage to install in pgdg build chroots for apt.postgresql.org diff --git a/jenkins/sbuild-package b/jenkins/sbuild-package index acaa492..ba52673 100755 --- a/jenkins/sbuild-package +++ b/jenkins/sbuild-package @@ -139,6 +139,7 @@ umask 002 ${BPOREPO:+--extra-repository="$BPOREPO"} \ ${binnmu_reason:+--make-binNMU="$binnmu_reason" --binNMU="$binnmu_version" -m "$MAILING_LIST"} \ ${FINISHED_BUILD_COMMAND:+--finished-build-commands="$FINISHED_BUILD_COMMAND"} \ + --no-run-lintian \ ${ADD_DEPENDS:-} $DSC ) 9> $LOCKDIR/$distribution-$architecture.lock diff --git a/jenkins/sbuild-update.sh b/jenkins/sbuild-update.sh index 14310a3..881af55 100755 --- a/jenkins/sbuild-update.sh +++ b/jenkins/sbuild-update.sh @@ -120,11 +120,6 @@ umask 002 # save backports lists rm -rf /var/lib/apt/backports /etc/apt/sources.list.d/backports.list.disabled if [ "$HAS_BACKPORTS" ]; then - # install lintian from backports (necessary because - # /usr/share/doc/lintian/lintian.html changes filetype in - # stretch/buster/bullseye, and upgrading on overlayfs fails) - apt-get -y -o DPkg::Options::=--force-confnew install -t $distribution-backports lintian - mv /etc/apt/sources.list.d/backports.list /etc/apt/sources.list.d/backports.list.disabled mkdir -p /var/lib/apt/backports mv /var/lib/apt/lists/*backports* /var/lib/apt/backports @@ -132,7 +127,7 @@ umask 002 [ -x /usr/bin/eatmydata ] && eatmydata="eatmydata" \$eatmydata apt-get -y -o DPkg::Options::=--force-confnew dist-upgrade - \$eatmydata apt-get -y -o DPkg::Options::=--force-confnew install pgdg-buildenv pgdg-keyring + \$eatmydata apt-get -y -o DPkg::Options::=--force-confnew install pgdg-buildenv pgdg-keyring lintian- eatmydata apt-get -y autoremove --purge # revert Ubuntu's default zstd compression for .debs |