Author: thl Update of /cvs/free/rpms/kmodtool/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv7610 Modified Files: Makefile Added Files: kmodtool-kernel-variants kmodtool-kmodtool kmodtool.spec Log Message: add kmodtool --- NEW FILE kmodtool-kernel-variants --- @(smp?(-debug)|PAE?(-debug)|debug|kdump|xen) --- NEW FILE kmodtool-kmodtool --- #!/bin/bash # kmodtool - Helper script for building kernel module RPMs # Copyright (c) 2003-2008 Ville Skyttä <ville.skytta(a)iki.fi&gt;, # Thorsten Leemhuis <fedora(a)leemhuis.info&gt; # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the # "Software"), to deal in the Software without restriction, including # without limitation the rights to use, copy, modify, merge, publish, # distribute, sublicense, and/or sell copies of the Software, and to # permit persons to whom the Software is furnished to do so, subject to # the following conditions: # # The above copyright notice and this permission notice shall be # included in all copies or substantial portions of the Software. # # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND # NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. shopt -s extglob myprog="kmodtool-${repo}" myver="0.11.3" kmodname= build_kernels="current" kernels_known_variants= kernel_versions= kernel_versions_to_build_for= prefix= filterfile= target= error_out() { local errorlevel=${1} shift echo "Error: $@" >&2 # the next line is not multi-line safe -- not needed *yet* echo "%define kmodtool_check echo \"kmodtool error: $@\"; exit ${errorlevel};" exit ${errorlevel} } print_rpmtemplate_header() { echo echo '%define kmodinstdir_prefix '/lib/modules/ echo '%define kmodinstdir_postfix '/extra/${kmodname}/ echo '%define kernel_versions '${kernel_versions} echo } print_akmodtemplate () { echo cat <<EOF %define akmod_install mkdir -p \$RPM_BUILD_ROOT/%{_usrsrc}/akmods/; \\\ rpmbuild --define "_sourcedir %{_sourcedir}" \\\ --define "_srcrpmdir \$RPM_BUILD_ROOT/%{_usrsrc}/akmods/" \\\ -bs --nodeps %{_specdir}/%{name}.spec ; \\\ ln -s \$(ls \$RPM_BUILD_ROOT/%{_usrsrc}/akmods/) \$RPM_BUILD_ROOT/%{_usrsrc}/akmods/${kmodname}-kmod.latest %package -n akmod-${kmodname} Summary: Akmod package for ${kmodname} kernel module(s) Group: System Environment/Kernel Requires: kmodtool Requires: akmods %{?AkmodsBuildRequires:Requires: %{AkmodsBuildRequires}} # same requires and provides as a kmods package would have Requires: ${kmodname}-kmod-common >= %{?epoch:%{epoch}:}%{version} Provides: ${kmodname}-kmod = %{?epoch:%{epoch}:}%{version}-%{release} %description -n akmod-${kmodname} This package provides the akmod package for the ${kmodname} kernel modules. %files -n akmod-${kmodname} %defattr(-,root,root,-) %{_usrsrc}/akmods/* EOF } print_akmodmeta () { cat <<EOF %package -n kmod-${kmodname} Summary: Metapackage which tracks in ${kmodname} kernel module for newest kernel${dashvariant} Group: System Environment/Kernel Provides: ${kmodname}-kmod = %{?epoch:%{epoch}:}%{version}-%{release} Provides: kmod-${kmodname}-xen = %{?epoch:%{epoch}:}%{version}-%{release} Provides: kmod-${kmodname}-smp = %{?epoch:%{epoch}:}%{version}-%{release} Provides: kmod-${kmodname}-PAE = %{?epoch:%{epoch}:}%{version}-%{release} Requires: akmod-${kmodname} = %{?epoch:%{epoch}:}%{version}-%{release} %description -n kmod-${kmodname}${dashvariant} This is a meta-package without payload which sole purpose is to require the ${kmodname} kernel module(s) for the newest kernel${dashvariant}, to make sure you get it together with a new kernel. %files -n kmod-${kmodname}${dashvariant} %defattr(644,root,root,755) EOF } print_rpmtemplate_per_kmodpkg () { if [[ "${1}" == "--custom" ]]; then shift local customkernel=true elif [[ "${1}" == "--redhat" ]]; then # this is needed for akmods shift local redhatkernel=true fi local kernel_uname_r=${1} local kernel_variant="${2:+-${2}}" # first part cat <<EOF %package -n kmod-${kmodname}-${kernel_uname_r} Summary: ${kmodname} kernel module(s) for ${kernel_uname_r} Group: System Environment/Kernel Provides: kernel-modules-for-kernel = ${kernel_uname_r} Provides: ${kmodname}-kmod = %{?epoch:%{epoch}:}%{version}-%{release} Requires: ${kmodname}-kmod-common >= %{?epoch:%{epoch}:}%{version} Requires(post): /sbin/depmod Requires(postun): /sbin/depmod EOF # second part if [[ ! "${customkernel}" ]]; then if [[ ! "${redhatkernel}" ]]; then # when we build for custom kernels using "--for-kernels" don't require the meta # package, as it's useless and complicates things for the user without need cat <<EOF Requires: kmod-${kmodname}${kernel_variant} >= %{version}-%{release} EOF fi cat <<EOF Requires: kernel-uname-r = ${kernel_uname_r} BuildRequires: kernel-devel-uname-r = ${kernel_uname_r} %post -n kmod-${kmodname}-${kernel_uname_r} /sbin/depmod -aeF /boot/System.map-${kernel_uname_r} ${kernel_uname_r} > /dev/null || : %postun -n kmod-${kmodname}-${kernel_uname_r} /sbin/depmod -aF /boot/System.map-${kernel_uname_r} ${kernel_uname_r} &> /dev/null || : EOF else cat <<EOF %post -n kmod-${kmodname}-${kernel_uname_r} [[ "$(uname -r)" == "${kernel_uname_r}" ]] && /sbin/depmod -a > /dev/null || : %postun -n kmod-${kmodname}-${kernel_uname_r} [[ "$(uname -r)" == "${kernel_uname_r}" ]] && /sbin/depmod -a > /dev/null || : EOF fi # third part cat <<EOF %description -n kmod-${kmodname}-${kernel_uname_r} This package provides the ${kmodname} kernel modules built for the Linux kernel ${kernel_uname_r} for the %{_target_cpu} family of processors. %files -n kmod-${kmodname}-${kernel_uname_r} %defattr(644,root,root,755) /lib/modules/${kernel_uname_r}/extra/${kmodname}/ EOF } print_rpmtemplate_kmodmetapkg () { local kernel_uname_r=${1} local kernel_variant="${2:+-${2}}" cat <<EOF %package -n kmod-${kmodname}${kernel_variant} Summary: Metapackage which tracks in ${kmodname} kernel module for newest kernel${kernel_variant} Group: System Environment/Kernel Provides: ${kmodname}-kmod = %{?epoch:%{epoch}:}%{version}-%{release} Requires: kmod-${kmodname}-${kernel_uname_r} = %{?epoch:%{epoch}:}%{version}-%{release} %description -n kmod-${kmodname}${kernel_variant} This is a meta-package without payload which sole purpose is to require the ${kmodname} kernel module(s) for the newest kernel${kernel_variant}. to make sure you get it together with a new kernel. %files -n kmod-${kmodname}${kernel_variant} %defattr(644,root,root,755) EOF } print_customrpmtemplate () { for kernel in ${1} do if [[ -e "/usr/src/kernels/${kernel}" ]] ; then # this looks like a Fedora/RH kernel -- print a normal template (which includes the proper BR) and be happy :) kernel_versions="${kernel_versions}${kernel}___%{_usrsrc}/kernels/${kernel} " # parse kernel versions string and print template local kernel_verrelarch=${kernel%%${kernels_known_variants}} print_rpmtemplate_per_kmodpkg --redhat ${kernel} ${kernel##${kernel_verrelarch}} elif [[ -e /lib/modules/"${kernel}"/build/Makefile ]] ; then # likely a user-build-kernel with available buildfiles # fixme: we should check if uname from Makefile is the same as ${kernel} kernel_versions="${kernel_versions}${kernel}___/lib/modules/${kernel}/build/ " print_rpmtemplate_per_kmodpkg --custom "${kernel}" else error_out 2 "Don't know how to handle ${kernel} -- /lib/modules/${kernel}/build/Makefile not found" fi done # well, it's no header anymore, but who cares ;-) print_rpmtemplate_header } print_rpmtemplate () { # create kernel_versions var for kernel_version in ${kernel_versions_to_build_for} do kernel_versions="${kernel_versions}${kernel_version}___%{_usrsrc}/kernels/${kernel_version} " done # and print it and some other required stuff as macro print_rpmtemplate_header # now print the packages itselfs for kernel in ${kernel_versions_to_build_for} ; do local kernel_verrelarch=${kernel%%${kernels_known_variants}} # create metapackage print_rpmtemplate_kmodmetapkg ${kernel} ${kernel##${kernel_verrelarch}} # create package print_rpmtemplate_per_kmodpkg ${kernel} ${kernel##${kernel_verrelarch}} done } myprog_help () { echo "Usage: $(basename ${0}) [OPTIONS]" echo $'\n'"Creates a template to be used during kmod building" echo $'\n'"Available options:" # FIXME echo " --datadir <dir> -- look for our shared files in <dir>" echo " --filterfile <file> -- filter the results with grep --file <file>" echo " --for-kernels <list> -- created templates only for these kernels" echo " --kmodname <file> -- name of the kmod (required)" echo " --noakmod -- no akmod package" echo " --repo <name> -- use buildsys-build-<name>-kerneldevpkgs" echo " --target <arch> -- target-arch (required)" } while [ "${1}" ] ; do case "${1}" in --filterfile) shift if [[ ! "${1}" ]] ; then error_out 2 "Please provide path to a filter-file together with --filterfile" >&2 elif [[ ! -e "${1}" ]]; then error_out 2 "Filterfile ${1} not found" >&2 fi filterfile="${1}" shift ;; --kmodname) shift if [[ ! "${1}" ]] ; then error_out 2 "Please provide the name of the kmod together with --kmodname" >&2 fi # strip pending -kmod kmodname="${1%%-kmod}" shift ;; --repo) shift if [[ ! "${1}" ]] ; then error_out 2 "Please provide the name of the repo together with --repo" >&2 fi repo=${1} shift ;; --for-kernels) shift if [[ ! "${1}" ]] ; then error_out 2 "Please provide the name of the kmod together with --kmodname" >&2 fi for_kernels="${1}" shift ;; --noakmod) shift noakmod="true" ;; --target) shift target="${1}" shift ;; --akmod) shift build_kernels="akmod" ;; --newest) shift build_kernels="newest" ;; --current) shift build_kernels="current" ;; --help) myprog_help exit 0 ;; --version) echo "${myprog} ${myver}" exit 0 ;; *) echo "Error: Unknown option '${1}'." >&2 usage >&2 exit 2 ;; esac done if [[ -e ./kmodtool-kernel-variants ]]; then kernels_known_variants="$(cat ./kmodtool-kernel-variants)" elif [[ -e /usr/share/kmodtool/kernel-variants ]] ; then kernels_known_variants="$(cat /usr/share/kmodtool/kernel-variants)" else error_out 2 "Could not find /usr/share/kmodtool/kernel-variants" fi # general sanity checks if [[ ! "${target}" ]]; then error_out 2 "please pass target arch with --target" elif [[ ! "${kmodname}" ]]; then error_out 2 "please pass kmodname with --kmodname" elif [[ ! "${kernels_known_variants}" ]] ; then error_out 2 "could not determine known variants" fi # go if [[ "${for_kernels}" ]]; then # this is easy: print_customrpmtemplate "${for_kernels}" elif [[ "${build_kernels}" == "akmod" ]]; then # do only a akmod package print_akmodtemplate print_akmodmeta else # seems we are on out own to decide for which kernels to build # we need more sanity checks in this case if [[ ! "${repo}" ]]; then error_out 2 "please provide repo name with --repo" elif ! $(which buildsys-build-${repo}-kerneldevpkgs &> /dev/null) ; then error_out 2 "buildsys-build-${repo}-kerneldevpkgs not found" fi # call buildsys-build-${repo}-kerneldevpkgs to get the list of kernels cmdoptions="--target ${target}" # filterfile to filter list of kernels? if [[ "${filterfile}" ]] ; then cmdoptions="${cmdoptions} --filterfile ${filterfile}" fi kernel_versions_to_build_for="$(buildsys-build-${repo}-kerneldevpkgs --${build_kernels} ${cmdoptions})" returncode=$? if (( ${returncode} != 0 )); then error_out 2 "buildsys-build-${repo}-kerneldevpkgs failed: $(buildsys-build-${repo}-kerneldevpkgs --${build_kernels} ${cmdoptions})" fi if [[ "${build_kernels}" == "current" ]] && [[ ! "${noakmod}" ]]; then print_akmodtemplate fi print_rpmtemplate fi --- NEW FILE kmodtool.spec --- Name: kmodtool Version: 1 Release: 13%{?dist} Summary: Tool for building kmod packages Group: Development/Tools License: MIT URL: http://rpmfusion.org/Packaging/KernelModules/Kmods2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Obsoletes: kmod-helpers-livna < 17 # no need to provide kmod-helpers-livna as it was only in devel Source1: %{name}-kmodtool Source2: %{name}-kernel-variants %description This package contains tools and list of recent kernels that get used when building kmod-packages. %prep echo nothing to prep %build echo nothing to build %install rm -rf $RPM_BUILD_ROOT .tmp/ # install mkdir -p $RPM_BUILD_ROOT/%{_bindir} $RPM_BUILD_ROOT/%{_datadir}/%{name}/ install -p -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}/kmodtool install -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/%{name}/kernel-variants # adjust default-path sed -i 's|^default_prefix=.*|default_prefix=%{_datadir}/%{name}/|' \ $RPM_BUILD_ROOT/%{_bindir}/kmodtool %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_bindir}/* %{_datadir}/%{name}/ %changelog * Tue Sep 30 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1-13 - rebuild for RPM Fusion * Sat Aug 02 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1-12 - fix #2056 (kmod provides in akmod package needs epoch) * Sat Jun 14 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1-11 - fix #2011 * Sun Apr 06 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1-10 - use better Requires and BuildRequires to avoid fileslist download * Sat Mar 29 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1-9 - adjust to recent "arch and flavor in uname" changes from j-rod * Sat Feb 23 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1-8 - add AkmodsBuildRequires stuff to akmods template, so those rare kmod packages that need special BR can be added to the akmod package * Sat Jan 26 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1-7 - fix the akmods vs. akmod confusion and use akmod normally * Wed Jan 09 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1-6 - integrate akmodstool into kmodtool * Mon Dec 17 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1-5 - update kmodtool, so the kmod-foo-<uname -r> package does not require the kmod-foo package when building for kernels that were passed with for-kernels * Tue Dec 04 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1-4 - update kmodtool, so the kmod-foo metapackage requires the proper version of the kmod-foo-<uname -r> package * Tue Dec 04 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1-3 - update kmodtool, so the kmod-foo metapackage provides foo-kmod (which it only indirectly does); that should fix #1742, as kmod-foo has a shorter name now then kmod-foo-<uname -r> * Sat Dec 01 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1-2 - update kmodtool, so the kmod-foo-<uname -r> package tracks in kmod-foo * Sun Oct 28 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1-1 - split buildsys stuff out into a seperate package - rename kmod-helpers-livna to kmodtool - add proper obsoletes - make package noarch * Sat Oct 27 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 16-2 - Update to latest kernels 2.6.23.1-35.fc8 2.6.21-2950.fc8xen * Sat Oct 27 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 16-1 - Update to latest kernels 2.6.23.1-35.fc8 2.6.21-2949.fc8xen * Thu Oct 18 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 15-1 - rebuilt for latest kernels * Thu Oct 18 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 14-1 - rebuilt for latest kernels * Thu Oct 18 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 13-1 - rebuilt for latest kernels * Thu Oct 18 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 12-1 - rebuilt for latest kernels * Fri Oct 12 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 11-1 - rebuilt for latest kernels * Thu Oct 11 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 10-1 - rebuilt for latest kernels * Wed Oct 10 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 9-2 - fix typo * Wed Oct 10 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 9-1 - rebuilt for latest kernels * Sun Oct 07 2007 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 8-1 - update for 2.6.23-0.224.rc9.git6.fc8 * Sun Oct 07 2007 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 7-1 - update for 2.6.23-0.222.rc9.git1.fc8 * Wed Oct 03 2007 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 6-1 - update for 2.6.23-0.217.rc9.git1.fc8 and 2.6.21-2947.fc8xen * Wed Oct 03 2007 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5-1 - disable --all-but-latest stuff -- does not work as expected - rename up2date list of kernels from "latest" to "current" as latest and newest are to similar in wording; asjust script as well - kmodtool: don't provide kernel-modules, not needed anymore with the new stayle and hurts * Sun Sep 09 2007 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 4-2 - fix typos in spec file and list-kernels script - interdependencies between the two buildsys-build packages needs to be arch specific as well * Sun Sep 09 2007 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 4-1 - s/latests/latest/ - update kernel lists for rawhide and test2 kernels - make kmod-helpers-livna-list-kernels print BuildRequires for all kernels as well; this is not needed and will slow build a bit as it will track all the kernel-devel packages in, but that way we make sure they are really available in the buildsys * Fri Sep 07 2007 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3-4 - implement proper arch deps * Fri Sep 07 2007 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3-3 - proper list of todays rawhide-kernels * Fri Sep 07 2007 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3-2 - fix typo in kmod-helpers-livna-latests-kernels * Fri Sep 07 2007 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3-1 - adjust for devel * Sat Sep 01 2007 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2-1 - initial package Index: Makefile =================================================================== RCS file: /cvs/free/rpms/kmodtool/devel/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile 30 Sep 2008 16:45:10 -0000 1.1 +++ Makefile 30 Sep 2008 17:05:40 -0000 1.2 @@ -1,18 +1,18 @@ -# Makefile for source rpm: kmodtool +# Makefile for source rpm: ntfs-kmod # $Id$ NAME := kmodtool SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ../../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/.svn/entries -a -w $$/Makefile.common ] ; then cd $$d ; svn -q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef -MAKEFILE_COMMON := $(shell $(find-makefile-common)) +MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +test -f .svn/entries && { svn -q checkout $$(svn info |grep '^URL :'|cut -d' ' -f 3|cut -d/ -f -4)/common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' directory module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common))