summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/reproducible_common.sh20
-rwxr-xr-xbin/reproducible_create_meta_pkg_sets.sh92
2 files changed, 56 insertions, 56 deletions
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index a37169f2..02b585c3 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -144,16 +144,16 @@ mkdir -p /var/lib/jenkins/userContent/rb-pkg/
META_PKGSET[1]="essential"
META_PKGSET[2]="required"
META_PKGSET[3]="build-essential"
-META_PKGSET[4]="gnome"
-META_PKGSET[5]="gnome_build-depends"
-META_PKGSET[6]="tails"
-META_PKGSET[7]="tails_build-depends"
-META_PKGSET[8]="maint_pkg-perl-maintainers"
-META_PKGSET[9]="popcon_top1337-installed-sources"
-META_PKGSET[10]="installed_on_debian.org"
-META_PKGSET[11]="had_a_DSA"
-META_PKGSET[12]="grml"
-META_PKGSET[13]="grml_build-depends"
+META_PKGSET[4]="popcon_top1337-installed-sources"
+META_PKGSET[5]="installed_on_debian.org"
+META_PKGSET[6]="had_a_DSA"
+META_PKGSET[7]="gnome"
+META_PKGSET[8]="gnome_build-depends"
+META_PKGSET[9]="tails"
+META_PKGSET[10]="tails_build-depends"
+META_PKGSET[11]="grml"
+META_PKGSET[12]="grml_build-depends"
+META_PKGSET[13]="maint_pkg-perl-maintainers"
init_html() {
SUITE=sid
diff --git a/bin/reproducible_create_meta_pkg_sets.sh b/bin/reproducible_create_meta_pkg_sets.sh
index 5618e5dd..00897cb4 100755
--- a/bin/reproducible_create_meta_pkg_sets.sh
+++ b/bin/reproducible_create_meta_pkg_sets.sh
@@ -114,12 +114,40 @@ if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[3]}.pkgset) ]
update_if_similar ${META_PKGSET[3]}.pkgset
fi
-# gnome and everything it depends on
+# popcon top 1337 installed sources
if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[4]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[4]}.pkgset ] ; then
+ SQL_QUERY="SELECT popcon_src.source FROM popcon_src ORDER BY popcon_src.insts DESC LIMIT 1337;"
+ PGPASSWORD=public-udd-mirror \
+ psql -U public-udd-mirror \
+ -h public-udd-mirror.xvm.mit.edu -p 5432 \
+ -t \
+ udd -c"${SQL_QUERY}" > $TMPFILE
+ update_if_similar ${META_PKGSET[4]}.pkgset
+fi
+
+# installed on one or more .debian.org machines
+if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[5]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[5]}.pkgset ] ; then
+ # FIXME: get a proper data provider from DSA...
+ # (so far it was a manual "dpkg --get-selections" on all machines
+ # converted into a list of source packages...)
+ cat /srv/jenkins/bin/reproducible_installed_on_debian.org > $TMPFILE
+ update_if_similar ${META_PKGSET[5]}.pkgset
+fi
+
+# packages which had a DSA
+if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[6]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[6]}.pkgset ] ; then
+ svn export svn://svn.debian.org/svn/secure-testing/data/DSA/list ${TMPFILE2}
+ grep "^\[" ${TMPFILE2} | grep "DSA-" | cut -d " " -f5|sort -u > $TMPFILE
+ convert_into_source_packages_only
+ update_if_similar ${META_PKGSET[6]}.pkgset
+fi
+
+# gnome and everything it depends on
+if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[7]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[7]}.pkgset ] ; then
chdist grep-dctrl-packages $DISTNAME -X \( -FPriority required --or -FPackage gnome \) > ${TMPFILE2}
schroot --directory /tmp -c source:jenkins-dpkg-jessie dose-deb-coinstall --deb-native-arch=$ARCH --bg=$PACKAGES --fg=${TMPFILE2} > $TMPFILE
convert_from_deb822_into_source_packages_only
- update_if_similar ${META_PKGSET[4]}.pkgset
+ update_if_similar ${META_PKGSET[7]}.pkgset
fi
# The build-depends of X tasks can be solved once dose-ceve is able to read
@@ -133,80 +161,52 @@ fi
# all build depends of gnome
rm -f $TMPFILE
-if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[5]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[5]}.pkgset ] ; then
- for PKG in $(cat $TPATH/${META_PKGSET[4]}.pkgset) ; do
+if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[8]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[8]}.pkgset ] ; then
+ for PKG in $(cat $TPATH/${META_PKGSET[7]}.pkgset) ; do
grep-dctrl -sBuild-Depends -n -X -FPackage $PKG $SOURCES | sed "s#([^()]*)##g ; s#\[[^][]*\]##g ; s#,##g" >> $TMPFILE
done
convert_into_source_packages_only
- update_if_similar ${META_PKGSET[5]}.pkgset
+ update_if_similar ${META_PKGSET[8]}.pkgset
fi
# tails
-if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[6]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[6]}.pkgset ] ; then
+if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[9]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[9]}.pkgset ] ; then
curl http://nightly.tails.boum.org/build_Tails_ISO_feature-jessie/latest.iso.binpkgs > $TMPFILE
curl http://nightly.tails.boum.org/build_Tails_ISO_feature-jessie/latest.iso.srcpkgs >> $TMPFILE
convert_into_source_packages_only
- update_if_similar ${META_PKGSET[6]}.pkgset
+ update_if_similar ${META_PKGSET[9]}.pkgset
fi
# all build depends of tails
rm -f $TMPFILE
-if [ -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[7]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[7]}.pkgset ] ; then
- for PKG in $(cat $TPATH/${META_PKGSET[6]}.pkgset) ; do
+if [ -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[10]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[10]}.pkgset ] ; then
+ for PKG in $(cat $TPATH/${META_PKGSET[9]}.pkgset) ; do
grep-dctrl -sBuild-Depends -n -X -FPackage $PKG $SOURCES | sed "s#([^()]*)##g ; s#\[[^][]*\]##g ; s#,##g" >> $TMPFILE
done
convert_into_source_packages_only
- update_if_similar ${META_PKGSET[7]}.pkgset
-fi
-
-# pkg-perl-maintainers
-if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[8]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[8]}.pkgset ] ; then
- grep-dctrl -sPackage -n -FMaintainer pkg-perl-maintainers@lists.alioth.debian.org $SOURCES > $TMPFILE
- convert_into_source_packages_only
- update_if_similar ${META_PKGSET[8]}.pkgset
-fi
-
-# popcon top 1337 installed sources
-if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[9]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[9]}.pkgset ] ; then
- SQL_QUERY="SELECT popcon_src.source FROM popcon_src ORDER BY popcon_src.insts DESC LIMIT 1337;"
- PGPASSWORD=public-udd-mirror \
- psql -U public-udd-mirror \
- -h public-udd-mirror.xvm.mit.edu -p 5432 \
- -t \
- udd -c"${SQL_QUERY}" > $TMPFILE
- update_if_similar ${META_PKGSET[9]}.pkgset
-fi
-
-# installed on one or more .debian.org machines
-if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[10]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[10]}.pkgset ] ; then
- # FIXME: get a proper data provider from DSA...
- # (so far it was a manual "dpkg --get-selections" on all machines
- # converted into a list of source packages...)
- cat /srv/jenkins/bin/reproducible_installed_on_debian.org > $TMPFILE
update_if_similar ${META_PKGSET[10]}.pkgset
fi
-# packages which had a DSA
+# grml
if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[11]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[11]}.pkgset ] ; then
- svn export svn://svn.debian.org/svn/secure-testing/data/DSA/list ${TMPFILE2}
- grep "^\[" ${TMPFILE2} | grep "DSA-" | cut -d " " -f5|sort -u > $TMPFILE
+ curl http://grml.org/files/grml64-full_latest/dpkg.selections | cut -f1 > $TMPFILE
convert_into_source_packages_only
update_if_similar ${META_PKGSET[11]}.pkgset
fi
-# grml
+# all build depends of grml
+rm -f $TMPFILE
if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[12]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[12]}.pkgset ] ; then
- curl http://grml.org/files/grml64-full_latest/dpkg.selections | cut -f1 > $TMPFILE
+ for PKG in $(cat $TPATH/${META_PKGSET[11]}.pkgset) ; do
+ grep-dctrl -sBuild-Depends -n -X -FPackage $PKG $SOURCES | sed "s#([^()]*)##g ; s#\[[^][]*\]##g ; s#,##g" >> $TMPFILE
+ done
convert_into_source_packages_only
update_if_similar ${META_PKGSET[12]}.pkgset
fi
-# all build depends of grml
-rm -f $TMPFILE
+# pkg-perl-maintainers
if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[13]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[13]}.pkgset ] ; then
- for PKG in $(cat $TPATH/${META_PKGSET[12]}.pkgset) ; do
- grep-dctrl -sBuild-Depends -n -X -FPackage $PKG $SOURCES | sed "s#([^()]*)##g ; s#\[[^][]*\]##g ; s#,##g" >> $TMPFILE
- done
+ grep-dctrl -sPackage -n -FMaintainer pkg-perl-maintainers@lists.alioth.debian.org $SOURCES > $TMPFILE
convert_into_source_packages_only
update_if_similar ${META_PKGSET[13]}.pkgset
fi