josch/multistrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add component support to multistrap.

Browse source 
git-svn-id: http://emdebian.org/svn/current@6769 563faec7-e20c-0410-992a-a66f704d0ccd
This commit is contained in:
codehelp 2010-02-27 20:05:07 +00:00
parent 77a68dd609
commit b96eaa5d63
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
debian/changelog vendored
View file

@ -2,8 +2,9 @@ emdebian-rootfs (2.0.5) unstable; urgency=low
* [INTL:fr] French program output translation (Closes: #558834) * [INTL:fr] French program output translation (Closes: #558834)
* Add shortcut conf files * Add shortcut conf files
* Add component support to multistrap.
-- Neil Williams <codehelp@debian.org> Sat, 27 Feb 2010 19:59:04 +0000 -- Neil Williams <codehelp@debian.org> Sat, 27 Feb 2010 19:59:54 +0000
emdebian-rootfs (2.0.4) unstable; urgency=low emdebian-rootfs (2.0.4) unstable; urgency=low

2
debian/control vendored
View file

@ -6,7 +6,7 @@ Uploaders: Wookey <wookey@debian.org>
Build-Depends: cdbs, debhelper (>= 5), po4a (>= 0.37.1), po-debconf Build-Depends: cdbs, debhelper (>= 5), po4a (>= 0.37.1), po-debconf
Build-Depends-Indep: devscripts, docbook-xml, docbook-xsl, Build-Depends-Indep: devscripts, docbook-xml, docbook-xsl,
gnupg, libxml2-utils, xml-core, xsltproc gnupg, libxml2-utils, xml-core, xsltproc
Standards-Version: 3.8.3 Standards-Version: 3.8.4
Homepage: http://www.emdebian.org/ Homepage: http://www.emdebian.org/
Vcs-Browser: http://buildd.emdebian.org/svn/browser/current/ Vcs-Browser: http://buildd.emdebian.org/svn/browser/current/
Vcs-Svn: http://buildd.emdebian.org/repos/current/ Vcs-Svn: http://buildd.emdebian.org/repos/current/

13
em_multistrap
View file

@ -27,7 +27,7 @@ use Locale::gettext;
use vars qw/ $progname $ourversion $dstrap $extra @aptsources use vars qw/ $progname $ourversion $dstrap $extra @aptsources
@archives $deb $cachedir $config_str %packages $retval $str $retries @archives $deb $cachedir $config_str %packages $retval $str $retries
$dir $include $arch $foreign $suite $url $unpack $sourcedir $msg $dir $include $arch $foreign $suite $url $unpack $sourcedir $msg
@e $sourcesname $libdir $dpkgdir @debootstrap %suites $mirror $etcdir @e $sourcesname $libdir $dpkgdir @debootstrap %suites %components $component $mirror $etcdir
$repo @dirs @touch %sources $section %keys $host $key $value $type $repo @dirs @touch %sources $section %keys $host $key $value $type
$file $config $tidy $noauth $keyring %keyrings $deflist @extrapkgs /; $file $config $tidy $noauth $keyring %keyrings $deflist @extrapkgs /;
@ -87,6 +87,7 @@ foreach $key (%$config)
%sources=(); %sources=();
%packages=(); %packages=();
%suites=(); %suites=();
%components=();
%keyrings=(); %keyrings=();
@aptsources=(); @aptsources=();
foreach $section (sort keys %keys) foreach $section (sort keys %keys)
@ -115,6 +116,11 @@ foreach $section (sort keys %keys)
$sources{$section}=$keys{$section}{'source'}; $sources{$section}=$keys{$section}{'source'};
$packages{$section}=$keys{$section}{'packages'}; $packages{$section}=$keys{$section}{'packages'};
$suites{$section}=$keys{$section}{'suite'}; $suites{$section}=$keys{$section}{'suite'};
$components{$section}=$keys{$section}{'components'};
if (not exists $components{$section})
{
$components{$section}='main';
}
$keyrings{$section}=$keys{$section}{'keyring'}; $keyrings{$section}=$keys{$section}{'keyring'};
push @extrapkgs, split (' ', lc($keys{$section}{'additional'})); push @extrapkgs, split (' ', lc($keys{$section}{'additional'}));
} }
@ -247,9 +253,10 @@ foreach my $aptsrc (@aptsources)
or die _g("Cannot open sources list"). $!; or die _g("Cannot open sources list"). $!;
$mirror = $sources{$aptsrc}; $mirror = $sources{$aptsrc};
$suite = $suites{$aptsrc}; $suite = $suites{$aptsrc};
$component = $components{$aptsrc};
print SOURCES<<END; print SOURCES<<END;
deb $mirror $suite main deb $mirror $suite $component
deb-src $mirror $suite main deb-src $mirror $suite $component
END END
close SOURCES; close SOURCES;
} }