diff --git a/prerequisites/ubuntu:20.04-prerequisites-packages.txt b/prerequisites/ubuntu:20.04-prerequisites-packages.txt index 0e7b17e..66ea414 100644 --- a/prerequisites/ubuntu:20.04-prerequisites-packages.txt +++ b/prerequisites/ubuntu:20.04-prerequisites-packages.txt @@ -1,2 +1,2 @@ pv cpio rsync kmod execstack imagemagick inkscape graphicsmagick subversion git bc unar wget sudo gcc g++ binutils autoconf automake autopoint libtool-bin make bzip2 libncurses5-dev libreadline-dev zlib1g-dev flex bison patch texinfo tofrodos gettext pkg-config ecj fastjar perl libstring-crc32-perl ruby gawk python libusb-dev unzip intltool libacl1-dev libcap-dev libc6-dev-i386 lib32ncurses5-dev gcc-multilib bsdmainutils lib32stdc++6 libglib2.0-dev ccache cmake lib32z1-dev libsqlite3-dev sqlite3 libzstd-dev netcat curl uuid-dev libssl-dev libgnutls28-dev -libzstd-dev:i386 sqlite3:i386 +libzstd-dev sqlite3 diff --git a/scripts/generate-prerequisites.sh b/scripts/generate-prerequisites.sh index 105dab0..bbfbe83 100755 --- a/scripts/generate-prerequisites.sh +++ b/scripts/generate-prerequisites.sh @@ -20,6 +20,8 @@ writePackageFile() { sed 's/^sudo //g' | \ # only accept lines starting with pattern A or pattern B (and cut the matching pattern), yes, this is ubuntu specific at the moment sed -n -E 's/^apt-get -y install |^apt -y install //p' | \ + # if there are packages named foo:i386 or bar:i386 ignore the "i386" + sed 's/:i386//g' | \ # collapse multiple whitespaces tr -s '[:blank:]' >"$TARGET_FILE" }