Skip to content

DLPX-73653 Unpin unzip package following fix for DLPX-73555 #225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
smeda-delphix merged 1 commit into from
Feb 4, 2022
Merged

DLPX-73653 Unpin unzip package following fix for DLPX-73555 #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 2 additions & 13 deletions lib/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,21 +471,10 @@ function create_workdir() {
function install_pkgs() {
for attempt in {1..3}; do
echo "Running: sudo env DEBIAN_FRONTEND=noninteractive " \
"apt-get install -y --allow-downgrades $*"
"apt-get install -y $*"

#
# We use the "--allow-downgrades" for the case of a
# package needing to install the "unzip" debian package
# that we build via the "misc-debs" linux-pkg package.
# The "misc-debs" based "unzip" package may have an
# older version than what's already installed on the
# system, so we need to "--allow-downgrades" in order to
# install that specific package; further, that specific
# package is required to build the "virtualization"
# debian packages.
#
sudo env DEBIAN_FRONTEND=noninteractive apt-get install \
-y --allow-downgrades "$@" && return
-y "$@" && return

echo "apt-get install failed, retrying."
sleep 10
Expand Down
1 change: 0 additions & 1 deletion package-lists/build/main.pkgs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ libkdumpfile
make-jpkg
makedumpfile
masking
misc-debs
nfs-utils
performance-diagnostics
ptools
Expand Down
77 changes: 0 additions & 77 deletions packages/misc-debs/config.sh
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions packages/virtualization/config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# shellcheck disable=SC2034

DEFAULT_PACKAGE_GIT_URL="https://gitlab.delphix.com/app/dlpx-app-gate.git"
PACKAGE_DEPENDENCIES="adoptopenjdk crypt-blowfish host-jdks misc-debs"
PACKAGE_DEPENDENCIES="adoptopenjdk crypt-blowfish host-jdks"

function prepare() {
logmust read_list "$WORKDIR/repo/appliance/packaging/build-dependencies"
Expand All @@ -26,8 +26,7 @@ function prepare() {
logmust install_pkgs \
"$DEPDIR"/adoptopenjdk/*.deb \
"$DEPDIR"/crypt-blowfish/*.deb \
"$DEPDIR"/host-jdks/*.deb \
"$DEPDIR"/misc-debs/unzip_6.0-21ubuntu1_amd64.deb
"$DEPDIR"/host-jdks/*.deb
}

function build() {
Expand Down