From 70576f582a10d204b13d9216e62d02c1fc1afba3 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Tue, 8 Nov 2016 22:26:07 +0100 Subject: reproducible Debian: rename meta_pkgset.csv to reproducible_pkgsets.csv --- bin/meta_pkgset.csv | 45 -------------------------------- bin/reproducible_common.py | 2 +- bin/reproducible_common.sh | 2 +- bin/reproducible_create_meta_pkg_sets.sh | 4 +-- bin/reproducible_pkgsets.csv | 45 ++++++++++++++++++++++++++++++++ 5 files changed, 49 insertions(+), 49 deletions(-) delete mode 100644 bin/meta_pkgset.csv create mode 100644 bin/reproducible_pkgsets.csv diff --git a/bin/meta_pkgset.csv b/bin/meta_pkgset.csv deleted file mode 100644 index 80370645..00000000 --- a/bin/meta_pkgset.csv +++ /dev/null @@ -1,45 +0,0 @@ -1,Debian,essential -2,Debian,required -3,Debian,build-essential -4,Debian,build-essential-depends -5,Debian,popcon_top1337-installed-sources -6,Debian,key_packages -7,Debian,installed_on_debian.org -8,Debian,had_a_DSA -9,Debian,cii-census -10,desktop,gnome -11,desktop,gnome_build-depends -12,desktop,kde -13,desktop,kde_build-depends -14,desktop,mate -15,desktop,mate_build-depends -16,desktop,xfce -17,desktop,xfce_build-depends -18,Debian distribution,debian-edu -19,Debian distribution,debian-edu_build-depends -20,Debian distribution,freedombox -21,Debian distribution,freedombox_build-depends -22,Debian distribution,grml -23,Debian distribution,grml_build-depends -24,Debian distribution,tails -25,Debian distribution,tails_build-depends -26,Debian distribution,subgraph_OS -27,Debian distribution,subgraph_OS_build-depends -28,maintenance team,maint_debian-boot -29,maintenance team,maint_debian-med -30,maintenance team,maint_debian-ocaml -31,maintenance team,maint_debian-python -32,maintenance team,maint_debian-qa -33,maintenance team,maint_debian-science -34,maintenance team,maint_debian-x -35,maintenance team,maint_lua -36,maintenance team,maint_pkg-fonts-devel -37,maintenance team,maint_pkg-games-devel -38,maintenance team,maint_pkg-golang-maintainers -39,maintenance team,maint_pkg-haskell-maintainers -40,maintenance team,maint_pkg-java-maintainers -41,maintenance team,maint_pkg-javascript-devel -42,maintenance team,maint_pkg-multimedia-maintainers -43,maintenance team,maint_pkg-perl-maintainers -44,maintenance team,maint_pkg-php-pear -45,maintenance team,maint_pkg-ruby-extras-maintainers diff --git a/bin/reproducible_common.py b/bin/reproducible_common.py index 443ef9cf..04552d13 100755 --- a/bin/reproducible_common.py +++ b/bin/reproducible_common.py @@ -90,7 +90,7 @@ JENKINS_URL = 'https://jenkins.debian.net' # META_PKGSET[pkgset_id] = (pkgset_name, pkgset_group) # csv file columns: (pkgset_id, pkgset_group, pkgset_name) META_PKGSET = {} -with open(os.path.join(BIN_PATH, './meta_pkgset.csv'), newline='') as f: +with open(os.path.join(BIN_PATH, './reproducible_pkgsets.csv'), newline='') as f: for line in csv.reader(f): META_PKGSET[int(line[0])] = (line[2], line[1]) diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh index b4af8375..c7a2d591 100755 --- a/bin/reproducible_common.sh +++ b/bin/reproducible_common.sh @@ -114,7 +114,7 @@ TABLE[9]=stats_bugs_sin_ftbfs_state while IFS=, read col1 col2 col3 do META_PKGSET[$col1]=$col3 -done < $BIN_PATH/meta_pkgset.csv +done < $BIN_PATH/reproducible_pkgsets.csv # mustache templates PAGE_FOOTER_TEMPLATE=$TEMPLATE_PATH/default_page_footer.mustache diff --git a/bin/reproducible_create_meta_pkg_sets.sh b/bin/reproducible_create_meta_pkg_sets.sh index 5d4dfc89..dcce7603 100755 --- a/bin/reproducible_create_meta_pkg_sets.sh +++ b/bin/reproducible_create_meta_pkg_sets.sh @@ -149,7 +149,7 @@ use_previous_sets_build_depends() { update_pkg_set_specific() { # - # bin/meta_pkgset.csv defines the names of the packages set and their ordering + # bin/reproducible_pkgsets.csv defines the names of the packages set and their ordering # case ${META_PKGSET[$index]} in essential) @@ -266,7 +266,7 @@ update_pkg_set_specific() { fi ;; *_build-depends) - # all build depends of the previous set (as defined in bin/meta_pkgset.csv) + # all build depends of the previous set (as defined in bin/reproducible_pkgsets.csv) use_previous_sets_build_depends ;; kde) # kde and everything it depends on diff --git a/bin/reproducible_pkgsets.csv b/bin/reproducible_pkgsets.csv new file mode 100644 index 00000000..80370645 --- /dev/null +++ b/bin/reproducible_pkgsets.csv @@ -0,0 +1,45 @@ +1,Debian,essential +2,Debian,required +3,Debian,build-essential +4,Debian,build-essential-depends +5,Debian,popcon_top1337-installed-sources +6,Debian,key_packages +7,Debian,installed_on_debian.org +8,Debian,had_a_DSA +9,Debian,cii-census +10,desktop,gnome +11,desktop,gnome_build-depends +12,desktop,kde +13,desktop,kde_build-depends +14,desktop,mate +15,desktop,mate_build-depends +16,desktop,xfce +17,desktop,xfce_build-depends +18,Debian distribution,debian-edu +19,Debian distribution,debian-edu_build-depends +20,Debian distribution,freedombox +21,Debian distribution,freedombox_build-depends +22,Debian distribution,grml +23,Debian distribution,grml_build-depends +24,Debian distribution,tails +25,Debian distribution,tails_build-depends +26,Debian distribution,subgraph_OS +27,Debian distribution,subgraph_OS_build-depends +28,maintenance team,maint_debian-boot +29,maintenance team,maint_debian-med +30,maintenance team,maint_debian-ocaml +31,maintenance team,maint_debian-python +32,maintenance team,maint_debian-qa +33,maintenance team,maint_debian-science +34,maintenance team,maint_debian-x +35,maintenance team,maint_lua +36,maintenance team,maint_pkg-fonts-devel +37,maintenance team,maint_pkg-games-devel +38,maintenance team,maint_pkg-golang-maintainers +39,maintenance team,maint_pkg-haskell-maintainers +40,maintenance team,maint_pkg-java-maintainers +41,maintenance team,maint_pkg-javascript-devel +42,maintenance team,maint_pkg-multimedia-maintainers +43,maintenance team,maint_pkg-perl-maintainers +44,maintenance team,maint_pkg-php-pear +45,maintenance team,maint_pkg-ruby-extras-maintainers -- cgit v1.2.3-70-g09d2