From: Michael Schröder Date: Fri, 6 Jun 2008 15:26:19 +0000 (+0000) Subject: - support %kernel_module_package_buildreq in sles10 X-Git-Tag: obs_2.0~375 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=45297c0beb88657100035e75a55e6fa4f38817d2;p=tools%2Fobs-build.git - support %kernel_module_package_buildreq in sles10 - update sl11.0 config - support exportfilter --- diff --git a/Build.pm b/Build.pm index 372ce8f..1906564 100644 --- a/Build.pm +++ b/Build.pm @@ -145,6 +145,7 @@ sub read_config { $config->{'substitute_vers'} = {}; $config->{'optflags'} = {}; $config->{'order'} = {}; + $config->{'exportfilter'} = {}; $config->{'rawmacros'} = ''; $config->{'release'} = '.'; $config->{'repotype'} = []; @@ -186,6 +187,10 @@ sub read_config { } else { $config->{'substitute'}->{$ll} = [ @l ]; } + } elsif ($l0 eq 'exportfilter:') { + next unless @l; + $ll = shift @l; + $config->{'exportfilter'}->{$ll} = [ @l ]; } elsif ($l0 eq 'optflags:') { next unless @l; $ll = shift @l; diff --git a/configs/sl11.0.conf b/configs/sl11.0.conf index 6cbf178..3b1a048 100644 --- a/configs/sl11.0.conf +++ b/configs/sl11.0.conf @@ -10,7 +10,8 @@ Runscripts: aaa_base VMinstall: util-linux perl-base libdb-4_5 libvolume_id Required: autoconf automake binutils bzip2 gcc gcc%{gcc_version} -Required: gettext-runtime glibc libtool ncurses perl rpm zlib libmpfr1 gmp +Required: gettext-runtime glibc libtool perl rpm zlib libmpfr1 gmp +Required: libncurses5 Support: audit-libs cpio cpp cpp%{gcc_version} cracklib cvs Support: file findutils gawk gdbm gettext-tools @@ -21,6 +22,7 @@ Support: libvolume_id libxcrypt libzio Support: linux-kernel-headers make man netcfg Support: net-tools pam-modules patch perl-base sysvinit Support: texinfo timezone util-linux login +Support: terminfo-base libgomp43 libuuid1 psmisc %ifarch ia64 Support: libunwind libunwind-devel %endif @@ -367,6 +369,7 @@ Macros: %suseconfig_fonts_prereq perl aaa_base %install_info_prereq info %kernel_module_package_buildreq kernel-source kernel-syms +%kernel_module_package_buildreqs kernel-source kernel-syms %suse_version 1100 %sles_version 0 %ul_version 0 diff --git a/configs/sles10.conf b/configs/sles10.conf index 6e80875..bdc5827 100644 --- a/configs/sles10.conf +++ b/configs/sles10.conf @@ -191,6 +191,8 @@ Macros: %fillup_prereq fillup coreutils %suseconfig_fonts_prereq perl aaa_base %install_info_prereq info +%kernel_module_package_buildreq kernel-source kernel-syms +%kernel_module_package_buildreqs kernel-source kernel-syms %suse_version 1010 %sles_version 10 %ul_version 0