diff options
| -rwxr-xr-x | bin/reproducible_build.sh | 2 | ||||
| -rw-r--r-- | job-cfg/reproducible.yaml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index d9f7b75b..29d64337 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -66,7 +66,7 @@ if [[ $1 =~ ^-?[0-9]+$ ]] ; then REAL_AMOUNT=0 GUESSES=$(echo "${AMOUNT}*3" | bc) PACKAGES="" - CANDIDATES=$(xzcat $TMPFILE | grep "^Package" | grep -v "^Package-List:" | cut -d " " -f2 | egrep -v "^linux$"| sort -R | head -$GUESSES | xargs echo) + CANDIDATES=$(xzcat $TMPFILE | grep "^Package" | grep -v "^Package-List:" | cut -d " " -f2 | egrep -v "^(linux$|util-linux)$" | sort -R | head -$GUESSES | xargs echo) for PKG in $CANDIDATES ; do if [ $REAL_AMOUNT -eq $AMOUNT ] ; then continue diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml index 64596c8f..60331100 100644 --- a/job-cfg/reproducible.yaml +++ b/job-cfg/reproducible.yaml @@ -220,12 +220,12 @@ my_description: 'Reproducible build of all the core packages as defined by UDD as described in https://wiki.debian.org/ReproducibleBuilds so these: ' my_timed: '42 5 1,16 * *' my_shell: '/srv/jenkins/bin/reproducible_build.sh' - my_packages: 'acl adduser attr audit base-files base-passwd bash binutils bsdmainutils bzip2 cdebconf cloog coreutils cryptsetup dash db5.3 dbus debconf debhelper debianutils dh-buildinfo diffutils dpkg e2fsprogs eglibc file findutils gcc-4.9 gcc-defaults gdbm gettext glib2.0 glibc gmp grep groff gzip hostname init-system-helpers insserv intltool-debian isl kmod libcap2 libcroco libffi libgcrypt11 libgcrypt20 libgpg-error libintl-perl libpipeline libselinux libsemanage libsepol libtext-unidecode-perl libtimedate-perl libunistring libxml2 libxml-libxml-perl libxml-namespacesupport-perl libxml-sax-base-perl libxml-sax-perl linux lsb lvm2 make-dfsg man-db mawk mpclib3 mpfr4 ncurses pam patch pcre3 perl po-debconf procps sed sensible-utils shadow startpar systemd sysvinit tar tcp-wrappers texinfo tzdata ucf ustr util-linux xz-utils zlib' + my_packages: 'acl adduser attr audit base-files base-passwd bash binutils bsdmainutils bzip2 cdebconf cloog coreutils cryptsetup dash db5.3 dbus debconf debhelper debianutils dh-buildinfo diffutils dpkg e2fsprogs eglibc file findutils gcc-4.9 gcc-defaults gdbm gettext glib2.0 glibc gmp grep groff gzip hostname init-system-helpers insserv intltool-debian isl kmod libcap2 libcroco libffi libgcrypt11 libgcrypt20 libgpg-error libintl-perl libpipeline libselinux libsemanage libsepol libtext-unidecode-perl libtimedate-perl libunistring libxml2 libxml-libxml-perl libxml-namespacesupport-perl libxml-sax-base-perl libxml-sax-perl linux lsb lvm2 make-dfsg man-db mawk mpclib3 mpfr4 ncurses pam patch pcre3 perl po-debconf procps sed sensible-utils shadow startpar systemd sysvinit tar tcp-wrappers texinfo tzdata ucf ustr xz-utils zlib' # util-linux was removed as its spawns a m4 process which eats 40gb ram - '{name}_build_build-tools': my_description: 'Reproducible build packages which are used to build other packages.<br>Source packages to be build: ' my_timed: '42 23 1,16 * *' my_shell: '/srv/jenkins/bin/reproducible_build.sh' - my_packages: 'cdbs eglibc gcc-defaults devscripts python python3 ruby ghc php5 tcl asciidoc ant maven maven2 lintian pbuilder piuparts schroot fakeroot sbuild cowbuilder git subversion bzr' + my_packages: 'cdbs eglibc gcc-defaults devscripts python-defaults python3-defaults ruby-defaults ruby2.1 ghc php5 tcl asciidoc ant maven maven2 lintian pbuilder piuparts schroot fakeroot sbuild cowbuilder git subversion bzr' - '{name}_build_desktop_apps': my_description: 'Reproducible build of desktop applications: ' my_timed: '42 5 2,17 * *' |