[mkextrepo] Use genhdlist2 to generate empty hdlist files

mcb30 · May 9, 2010 · c56cc7b · c56cc7b
1 parent d8b5d10
commit c56cc7b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/extsys.spec b/extsys.spec
@@ -1,6 +1,6 @@
 %define name extsys
-%define version 0.1
-%define release 1fs
+%define version 0.2
+%define release %mkrel 1
 
 %define extsysdir %{_var}/lib/extsys
 %define mdvversion 2010.0
@@ -14,6 +14,7 @@ License: GPL
 Group: Development/Other
 BuildArchitectures: noarch
 Requires: subversion-tools subversion-server bm mdvsys mdv-youri-submit
+Requires: genhdlist2
 Requires: mandriva-release-common = %{mdvversion}
 
 %description
@@ -81,5 +82,8 @@ fi
 %doc README
 
 %changelog
+* Sun May  9 2010 Michael Brown <mbrown@fensystems.co.uk> 0.2-1fs
+- Generate empty hdlist files on repository initialisation
+
 * Sun May  9 2010 Michael Brown <mbrown@fensystems.co.uk> 0.1-1fs
 - First packaged version
diff --git a/mkextrepo b/mkextrepo
@@ -51,8 +51,10 @@ print "Creating distribution tree \"".$distname."\" in ".$distdir."\n"
 make_path ( catdir ( $distdir, "SRPMS", "contrib", "release" ),
 	    catdir ( $distdir, "i586", "media", "media_info" ),
 	    catdir ( $distdir, "i586", "media", "contrib", "release" ),
+	    catdir ( $distdir, "i586", "media", "debug_contrib", "release" ),
 	    catdir ( $distdir, "x86_64", "media", "media_info" ),
-	    catdir ( $distdir, "x86_64", "media", "contrib", "release" ) );
+	    catdir ( $distdir, "x86_64", "media", "contrib", "release" ),
+	    catdir ( $distdir, "x86_64", "media", "debug_contrib", "release" ));
 
 my $media_cfg = {};
 $media_cfg->{x86_64} = <<__END_MEDIA_CFG__;
@@ -120,3 +122,15 @@ foreach my $arch ( keys %$media_cfg ) {
   syswrite $fh, $media_cfg->{$arch};
   close $fh;
 }
+
+my @hdlistdirs = ( catdir ( $distdir, "SRPMS", "contrib", "release" ) );
+foreach my $arch ( keys %$media_cfg ) {
+  foreach my $subdir qw ( contrib/release debug_contrib/release ) {
+    push @hdlistdirs, catdir ( $distdir, $arch, "media", $subdir );
+  }
+}
+foreach my $hdlistdir ( @hdlistdirs ) {
+  system ( "/usr/bin/genhdlist2", "--allow-empty-media", "--xml-info",
+	   "--quiet", $hdlistdir ) == 0
+	       or die "Could not generate empty hdlist: $?\n";
+}