Skip to content

Commit db6164f

Browse files
DLPX-79469 [Backport of DLPX-73653 to 6.0.13.0] Unpin unzip package following fix for DLPX-73555 (#226)
1 parent 8ce3872 commit db6164f

4 files changed

Lines changed: 4 additions & 94 deletions

File tree

lib/common.sh

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -471,21 +471,10 @@ function create_workdir() {
471471
function 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

package-lists/build/main.pkgs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ libkdumpfile
2222
make-jpkg
2323
makedumpfile
2424
masking
25-
misc-debs
2625
nfs-utils
2726
performance-diagnostics
2827
ptools

packages/misc-debs/config.sh

Lines changed: 0 additions & 77 deletions
This file was deleted.

packages/virtualization/config.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# shellcheck disable=SC2034
1818

1919
DEFAULT_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

2222
function 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

3332
function build() {

0 commit comments

Comments
 (0)