diff options
Diffstat (limited to 'tools/oem-prepare')
| -rwxr-xr-x | tools/oem-prepare | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/tools/oem-prepare b/tools/oem-prepare index b92201273..5c964251e 100755 --- a/tools/oem-prepare +++ b/tools/oem-prepare @@ -8,6 +8,8 @@ $mode =~ s/^--(rebuild|clean)$/$1/ or die "mode should be --rebuild or --clean\n open F, "$dir/VERSION" or die "no installation found on $dir"; while (<F>) { /[\s-]fr/ and $lang = 'fr'; + /\[lang[=:]([^]]*)\]/ and $lang = $1; + /\[server\]/ and $options{server} = ''; } close F; @@ -21,6 +23,9 @@ foreach ($lang || 'en') { /es/ and ($lang, $flang, $charset) = ('es', 'es_ES@euro', 'iso-8859-15'); } print "Found lang $lang\n"; +foreach (keys %options) { + print "Using option [$_" . ($options{$_} && "=$options{$_}") . "]\n"; +} my $packages = select_packages($dir, $lang); @@ -148,9 +153,9 @@ sub select_packages { if (exists $options{server}) { foreach (qw(KDE ACCESSIBILITY PUBLISHING CUPS EDITORS TEXT_TOOLS COMMUNICATIONS TERMINALS NETWORKING_FILE_TRANSFER NETWORKING_OTHER - NETWORKING_FILE_TRANSFER_SERVER NETWORKING_FIREWALLING_SERVER + NETWORKING_FILE_TRANSFER_SERVER NETWORKING_FIREWALLING_SERVER NETWORKING_LDAP_SERVER NETWORKING_MAIL_SERVER NETWORKING_OTHER_SERVER - NETWORKING_REMOTE_ACCESS NETWORKING_REMOTE_ACCESS_SERVER NETWORKING_DNS + NETWORKING_REMOTE_ACCESS NETWORKING_REMOTE_ACCESS_SERVER NETWORKING_DNS NETWORKING_DNS_SERVER NETWORKING_FILE NETWORKING_FILE_SERVER NETWORKING_WWW NETWORKING_WWW_SERVER ARCHIVING DEVELOPMENT MONITORING FILE_TOOLS CONFIG BOOKS SYSTEM X)) { $o->{compssUsersChoice}{$_} = 1; @@ -180,18 +185,19 @@ sub select_packages { foreach (qw(cups cups-drivers drakprofile draksync numlock raidtools reiserfsprogs xfsprogs jfsprogs icewm-light Mesa Mesa-demos alsa alsa-utils Mesa-demos glibc vim-minimal kernel - )) { + ), exists $options{server} ? qw(kernel22 openldap-migration openldap-clients pam_ldap) : ()) { my $pkg = pkgs::packageByName($o->{packages}, $_); $pkg and pkgs::selectPackage($o->{packages}, $pkg); } #- special packages that are to be move to closure always ... foreach (qw(kernel-smp kernel-linus kernel-secure hackkernel-smp hackkernel-linus hackkernel-secure kernel-pcmcia-cs - xawtv kwintv xscreensaver-gl xmms-mesa - bzflag csmash gltron spacecup chromium tuxracer FlightGear armagetron + xawtv kwintv xscreensaver-gl xmms-mesa openuniverse + csmash chromium tuxracer armagetron alsa imwheel nfs-utils-clients lvm usbd hotplug reiserfsprogs - sox aumix xawtv gatos kwintv sane-frontends gphoto gnome-toaster gcombust xcdroast apmd cdlabelgen - ), exists $options{server} ? qw(Aurora Aurora-Monitor-NewStyle-Categorizing-WsLib) : ()) { + sox aumix xmms-arts xawtv gatos kwintv sane-frontends gphoto gnome-toaster gcombust xcdroast apmd cdlabelgen + ), exists $options{server} ? qw(Aurora Aurora-Monitor-NewStyle-Categorizing-WsLib + kernel-enterprise kernel22-secure) : ()) { my $pkg = pkgs::packageByName($o->{packages}, $_); if ($pkg) { pkgs::selectPackage($o->{packages}, $pkg); |