File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -471,21 +471,10 @@ function create_workdir() {
471471function install_pkgs() {
472472 for attempt in {1..3}; do
473473 echo " Running: sudo env DEBIAN_FRONTEND=noninteractive " \
474- " apt-get install -y --allow-downgrades $* "
474+ " apt-get install -y $* "
475475
476- #
477- # We use the "--allow-downgrades" for the case of a
478- # package needing to install the "unzip" debian package
479- # that we build via the "misc-debs" linux-pkg package.
480- # The "misc-debs" based "unzip" package may have an
481- # older version than what's already installed on the
482- # system, so we need to "--allow-downgrades" in order to
483- # install that specific package; further, that specific
484- # package is required to build the "virtualization"
485- # debian packages.
486- #
487476 sudo env DEBIAN_FRONTEND=noninteractive apt-get install \
488- -y --allow-downgrades " $@ " && return
477+ -y " $@ " && return
489478
490479 echo " apt-get install failed, retrying."
491480 sleep 10
Original file line number Diff line number Diff line change @@ -22,7 +22,6 @@ libkdumpfile
2222make-jpkg
2323makedumpfile
2424masking
25- misc-debs
2625nfs-utils
2726performance-diagnostics
2827ptools
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 1717# shellcheck disable=SC2034
1818
1919DEFAULT_PACKAGE_GIT_URL=" https://gitlab.delphix.com/app/dlpx-app-gate.git"
20- PACKAGE_DEPENDENCIES=" adoptopenjdk crypt-blowfish host-jdks misc-debs "
20+ PACKAGE_DEPENDENCIES=" adoptopenjdk crypt-blowfish host-jdks"
2121
2222function prepare() {
2323 logmust read_list " $WORKDIR /repo/appliance/packaging/build-dependencies"
@@ -26,8 +26,7 @@ function prepare() {
2626 logmust install_pkgs \
2727 " $DEPDIR " /adoptopenjdk/* .deb \
2828 " $DEPDIR " /crypt-blowfish/* .deb \
29- " $DEPDIR " /host-jdks/* .deb \
30- " $DEPDIR " /misc-debs/unzip_6.0-21ubuntu1_amd64.deb
29+ " $DEPDIR " /host-jdks/* .deb
3130}
3231
3332function build() {
You can’t perform that action at this time.
0 commit comments