Author: thl Update of /cvs/free/rpms/buildsys-build-rpmfusion/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv21063 Modified Files: buildsys-build-rpmfusion-kerneldevpkgs-current buildsys-build-rpmfusion-list-kernels.sh buildsys-build-rpmfusion.spec Removed Files: buildsys-build-rpmfusion-filterfile_i586 buildsys-build-rpmfusion-filterfile_i686 buildsys-build-rpmfusion-filterfile_ppc buildsys-build-rpmfusion-filterfile_ppc64 buildsys-build-rpmfusion-filterfile_x86_64 Log Message: * Sun Feb 15 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10:11-0.8 - adjust for Fedora new kenrels scheme - use a different way to generate lists Index: buildsys-build-rpmfusion-kerneldevpkgs-current =================================================================== RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/devel/buildsys-build-rpmfusion-kerneldevpkgs-current,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- buildsys-build-rpmfusion-kerneldevpkgs-current 15 Jan 2009 17:36:36 -0000 1.16 +++ buildsys-build-rpmfusion-kerneldevpkgs-current 15 Feb 2009 14:41:53 -0000 1.17 @@ -1,3 +1 @@ default -defaultsmp -defaultPAE Index: buildsys-build-rpmfusion-list-kernels.sh =================================================================== RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/devel/buildsys-build-rpmfusion-list-kernels.sh,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- buildsys-build-rpmfusion-list-kernels.sh 15 Jan 2009 17:36:36 -0000 1.5 +++ buildsys-build-rpmfusion-list-kernels.sh 15 Feb 2009 14:41:53 -0000 1.6 @@ -26,7 +26,7 @@ shopt -s extglob -myver="0.0.7" +myver="0.1.0" repo=rpmfusion myprog="buildsys-build-${repo}-kerneldevpkgs" supported_targetarchs="i586 i686 x86_64 ppc ppc64" @@ -36,24 +36,50 @@ prefix=/usr/share/buildsys-build-${repo}/ fi + requires= filterfile= target=$(uname -m) -show_kernels="current" +#show_kernels="current" + +bb_list_kernels_default() +{ + echo ${1} +} + +bb_list_kernels_i586() +{ + bb_list_kernels_default ${1} +} + +bb_list_kernels_i686() +{ + echo ${1}PAE +} + +bb_list_kernels_x86_64() +{ + bb_list_kernels_default ${1} +} + +bb_list_kernels_ppc() +{ + bb_list_kernels_default ${1} + echo ${1}smp +} + +bb_list_kernels_ppc64() +{ + bb_list_kernels_default ${1} +} + print_kernels () { local this_target=${1} local this_grepoptions= local this_command= - local this_kernellistfiles= - - # which files to use - if [[ "${show_kernels}" == "newest" ]]; then - this_kernellistfiles="${prefix}kerneldevpkgs-newest" - elif [[ "${show_kernels}" == "current" ]]; then - this_kernellistfiles="${prefix}kerneldevpkgs-current" - fi + local this_kernellistfiles="${prefix}kerneldevpkgs-current" # error out if not defined if (( $(stat -c%s "${this_kernellistfiles}") <= 1 )); then @@ -61,31 +87,8 @@ return 1 fi - # if there are no newest kernels use current ones for newest - # can happen in rawhide - if [[ "${show_kernels}" == "newest" ]] && [[ -e "${prefix}kerneldevpkgs-newest" ]] && (( $(stat -c%s "${prefix}kerneldevpkgs-newest") <= 1 )) ; then - this_kernellistfiles="${prefix}kerneldevpkgs-current" - fi - - # target - if [[ "${this_target}" ]] ; then - this_grepoptions="${this_grepoptions} --file ${prefix}filterfile_${this_target}" - fi - - # custom filterfile - if [[ "${filterfile}" ]]; then - this_grepoptions="${this_grepoptions} --file ${filterfile}" - fi - - # do we need grep at all? - if [[ "${this_grepoptions}" ]]; then - this_command="grep --invert-match --no-filename" - else - this_command="cat" - fi - # go - ${this_command} ${this_grepoptions} ${this_kernellistfiles} | while read this_kernel; do + bb_list_kernels_${this_target} $(cat ${this_kernellistfiles}) | while read this_kernel; do this_kernel_verrel=${this_kernel%%$kernels_known_variants} this_kernel_variant=${this_kernel##$this_kernel_verrel} @@ -149,8 +152,8 @@ echo "Usage: $(basename ${0}) [OPTIONS]" echo $'\n'"Prints a list of all avilable kernel-devel packages in the buildsys, as"$'\n'"defined by the buildsys-buildkmods-all package." echo $'\n'"Available options:" - echo " --filterfile <file> -- filter the results with grep --file <file>" - echo " --current -- only list current up2date kernels" +# echo " --filterfile <file> -- filter the results with grep --file <file>" +# echo " --current -- only list current up2date kernels" # echo " --newest -- only list newly released kernels" echo " --requires -- print list as requires with ifarch section for"$'\n'" further use in a RPM spec file package header" echo " --prefix <dir> -- look for the data files in <prefix>" @@ -169,16 +172,17 @@ prefix="${1}" shift ;; +# not used anymore: --filterfile) shift - if [[ ! "${1}" ]] ; then - echo "Error: Please provide path to a filter-file together with --filterfile" >&2 - exit 2 - elif [[ ! -e "${1}" ]]; then - echo "Error: Filterfile ${1} not found" >&2 - exit 2 - fi - filterfile="${1}" +# if [[ ! "${1}" ]] ; then +# echo "Error: Please provide path to a filter-file together with --filterfile" >&2 +# exit 2 +# elif [[ ! -e "${1}" ]]; then +# echo "Error: Filterfile ${1} not found" >&2 +# exit 2 +# fi +# filterfile="${1}" shift ;; --target) @@ -209,13 +213,15 @@ shift buildrequires="true" ;; +# not used anymore: --current) shift - show_kernels="current" +# show_kernels="current" ;; +# not used anymore: --newest) shift - show_kernels="newest" +# show_kernels="newest" ;; --help) myprog_help @@ -242,10 +248,9 @@ echo "Could not find /usr/share/kmodtool/kernel-variants (required)" >&2 exit 2 fi - -# sanity checks +# sanity check to make sure it's really filled if [[ ! "${kernels_known_variants}" ]] ; then - echo "could not determine known kenrel variants" + echo "could not determine known kernel variants" exit 2 fi Index: buildsys-build-rpmfusion.spec =================================================================== RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/devel/buildsys-build-rpmfusion.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- buildsys-build-rpmfusion.spec 15 Jan 2009 17:36:36 -0000 1.21 +++ buildsys-build-rpmfusion.spec 15 Feb 2009 14:41:53 -0000 1.22 @@ -3,7 +3,7 @@ Name: buildsys-build-%{repo} Epoch: 10 Version: 11 -Release: 0.7 +Release: 0.8 Summary: Tools and files used by the %{repo} buildsys Group: Development/Tools @@ -14,11 +14,6 @@ Source2: %{name}-list-kernels.sh Source5: %{name}-README Source11: %{name}-kerneldevpkgs-current -Source20: %{name}-filterfile_i586 -Source21: %{name}-filterfile_i686 -Source22: %{name}-filterfile_x86_64 -Source23: %{name}-filterfile_ppc -Source24: %{name}-filterfile_ppc64 # provide this to avoid a error when generating akmods packages Provides: buildsys-build-rpmfusion-kerneldevpkgs-akmod-%{_target_cpu} @@ -76,11 +71,6 @@ install -p -m 0644 %{SOURCE5} .tmp/current/README ln -s kerneldevpkgs-current $RPM_BUILD_ROOT/%{_datadir}/%{name}/kerneldevpkgs-newest install -p -m 0644 %{SOURCE11} $RPM_BUILD_ROOT/%{_datadir}/%{name}/kerneldevpkgs-current -install -p -m 0644 %{SOURCE20} $RPM_BUILD_ROOT/%{_datadir}/%{name}/filterfile_i586 -install -p -m 0644 %{SOURCE21} $RPM_BUILD_ROOT/%{_datadir}/%{name}/filterfile_i686 -install -p -m 0644 %{SOURCE22} $RPM_BUILD_ROOT/%{_datadir}/%{name}/filterfile_x86_64 -install -p -m 0644 %{SOURCE23} $RPM_BUILD_ROOT/%{_datadir}/%{name}/filterfile_ppc -install -p -m 0644 %{SOURCE24} $RPM_BUILD_ROOT/%{_datadir}/%{name}/filterfile_ppc64 # adjust default-path @@ -100,7 +90,11 @@ %changelog -* Sun Jan 11 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10:11-0.1 +* Sun Feb 15 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10:11-0.8 +- adjust for Fedora new kenrels scheme +- use a different way to generate lists + +* Sun Jan 11 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10:11-0.7 - rebuild, and just use the latest as default * Sun Jan 11 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10:11-0.6 --- buildsys-build-rpmfusion-filterfile_i586 DELETED --- --- buildsys-build-rpmfusion-filterfile_i686 DELETED --- --- buildsys-build-rpmfusion-filterfile_ppc DELETED --- --- buildsys-build-rpmfusion-filterfile_ppc64 DELETED --- --- buildsys-build-rpmfusion-filterfile_x86_64 DELETED ---