10:14 a.m.
Author: thl
Update of /cvs/free/rpms/buildsys-build-rpmfusion/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13979
Modified Files:
Makefile buildsys-build-rpmfusion-filterfile_i586
buildsys-build-rpmfusion-filterfile_ppc
buildsys-build-rpmfusion-list-kernels.sh
buildsys-build-rpmfusion.spec
Log Message:
import the livna older version, as F8 uses the old style provides
Index: Makefile
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-8/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile 30 Sep 2008 16:44:34 -0000 1.1
+++ Makefile 3 Oct 2008 10:14:27 -0000 1.2
@@ -1,18 +1,18 @@
-# Makefile for source rpm: buildsys-build-rpmfusion
+# Makefile for source rpm: ntfs-kmod
# $Id$
NAME := buildsys-build-rpmfusion
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))
Index: buildsys-build-rpmfusion-filterfile_i586
===================================================================
RCS file:
/cvs/free/rpms/buildsys-build-rpmfusion/F-8/buildsys-build-rpmfusion-filterfile_i586,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- buildsys-build-rpmfusion-filterfile_i586 3 Oct 2008 06:49:56 -0000 1.1
+++ buildsys-build-rpmfusion-filterfile_i586 3 Oct 2008 10:14:27 -0000 1.2
@@ -1,2 +1,3 @@
smp$
PAE$
+xen$
Index: buildsys-build-rpmfusion-filterfile_ppc
===================================================================
RCS file:
/cvs/free/rpms/buildsys-build-rpmfusion/F-8/buildsys-build-rpmfusion-filterfile_ppc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- buildsys-build-rpmfusion-filterfile_ppc 3 Oct 2008 06:49:56 -0000 1.1
+++ buildsys-build-rpmfusion-filterfile_ppc 3 Oct 2008 10:14:27 -0000 1.2
@@ -1 +1,2 @@
PAE$
+xen$
Index: buildsys-build-rpmfusion-list-kernels.sh
===================================================================
RCS file:
/cvs/free/rpms/buildsys-build-rpmfusion/F-8/buildsys-build-rpmfusion-list-kernels.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- buildsys-build-rpmfusion-list-kernels.sh 3 Oct 2008 06:49:56 -0000 1.1
+++ buildsys-build-rpmfusion-list-kernels.sh 3 Oct 2008 10:14:27 -0000 1.2
@@ -26,10 +26,10 @@
shopt -s extglob
-myver="0.0.7"
+myver="0.0.6"
repo=rpmfusion
myprog="buildsys-build-${repo}-kerneldevpkgs"
-supported_targetarchs="i586 i686 x86_64 ppc ppc64"
+supported_targetarchs="i586 i686 x86_64 ppc"
if [[ -e ./buildsys-build-${repo}-kerneldevpkgs-current ]]; then
prefix=./buildsys-build-${repo}-
else
@@ -38,7 +38,7 @@
requires=
filterfile=
-target=$(uname -m)
+target=
show_kernels="current"
print_kernels ()
@@ -55,12 +55,6 @@
this_kernellistfiles="${prefix}kerneldevpkgs-current"
fi
- # error out if not defined
- if (( $(stat -c%s "${this_kernellistfiles}") <= 1 )); then
- echo "(no kernels defined)"
- 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
@@ -85,32 +79,7 @@
fi
# go
- ${this_command} ${this_grepoptions} ${this_kernellistfiles} | while read this_kernel; do
- this_kernel_verrel=${this_kernel%%$kernels_known_variants}
- this_kernel_variant=${this_kernel##$this_kernel_verrel}
-
- if [[ "${requires}" ]] || [[ "${buildrequires}" ]]; then
- if echo ${this_kernel} | grep -- 'default' &> /dev/null; then
- if [[ "${requires}" ]]; then
- echo "Requires:
kernel${this_kernel_variant:+-${this_kernel_variant}}-devel-${this_target}"
- fi
-
- if [[ "${buildrequires}" ]]; then
- echo "BuildRequires:
kernel${this_kernel_variant:+-${this_kernel_variant}}-devel-${this_target}"
- fi
- else
- if [[ "${requires}" ]]; then
- echo "Requires: kernel-devel-uname-r =
${this_kernel_verrel}.${this_target}${this_kernel_variant:+.${this_kernel_variant}}"
- fi
-
- if [[ "${buildrequires}" ]]; then
- echo "BuildRequires: kernel-devel-uname-r =
${this_kernel_verrel}.${this_target}${this_kernel_variant:+.${this_kernel_variant}}"
- fi
- fi
- else
- echo
${this_kernel_verrel}.${this_target}${this_kernel_variant:+.${this_kernel_variant}}
- fi
- done
+ ${this_command} ${this_grepoptions} ${this_kernellistfiles}
}
print_requires ()
@@ -119,8 +88,21 @@
local this_kernel_variant
for this_arch in ${supported_targetarchs}; do
+ # pre
echo $'\n'"%ifarch ${this_arch}"
- print_kernels ${this_arch}
+
+ # kernels
+ for this_kernel in $(print_kernels ${this_arch}); do
+ # preparations
+ this_kernel_verrel=${this_kernel%%$kernels_known_variants}
+ this_kernel_variant=${this_kernel##$this_kernel_verrel}
+
+ # print
+ [[ "${requires}" ]] && echo "Requires:
kernel${this_kernel_variant:+-${this_kernel_variant}}-devel-${this_arch} =
${this_kernel_verrel}"
+ [[ "${buildrequires}" ]] && echo "BuildRequires:
kernel${this_kernel_variant:+-${this_kernel_variant}}-devel-${this_arch} =
${this_kernel_verrel}"
+ done
+
+ # post
echo "%endif"
done
}
@@ -132,10 +114,11 @@
echo $'\n'"Available options:"
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 " --newest -- only list newly released kernels"
+# echo " --no-latest -- don't list latest up2date 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>"
- echo " --target <arch> -- target-arch (ignored if --requires is
used)"
+ echo " --target <arch> -- target-arch (ifnored if --requires is
used)"
echo $'\n'"Supported target archs: ${supported_targetarchs}"
}
@@ -198,6 +181,10 @@
shift
show_kernels="newest"
;;
+# --no-latest)
+# shift
+# show_kernels="nolatest"
+# ;;
--help)
myprog_help
exit 0
@@ -220,14 +207,14 @@
elif [[ -e /usr/share/kmodtool/kernel-variants ]] ; then
kernels_known_variants="$(cat /usr/share/kmodtool/kernel-variants)"
else
- echo "Could not find /usr/share/kmodtool/kernel-variants (required)"
>&2
+ echo "Could not find /usr/share/kmodtool/kernel-variants" >&2
exit 2
fi
# sanity checks
if [[ ! "${kernels_known_variants}" ]] ; then
- echo "could not determine known kenrel variants"
- exit 2
+ echo "could not determine known kenrel variants"
+ exit 2
fi
# go
Index: buildsys-build-rpmfusion.spec
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-8/buildsys-build-rpmfusion.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- buildsys-build-rpmfusion.spec 3 Oct 2008 06:49:56 -0000 1.1
+++ buildsys-build-rpmfusion.spec 3 Oct 2008 10:14:27 -0000 1.2
@@ -1,7 +1,7 @@
%define repo rpmfusion
Name: buildsys-build-%{repo}
-Version: 41
+Version: 42
Release: 1%{?dist}
Summary: Tools and files used by the %{repo} buildsys
@@ -19,70 +19,59 @@
Source22: %{name}-filterfile_x86_64
Source23: %{name}-filterfile_ppc
-# provide this to avoid a error when generating akmods packages
-Provides: buildsys-build-rpmfusion-kerneldevpkgs-akmod-%{_target_cpu}
+Requires: %{_bindir}/kmodtool
+BuildRequires: %{_bindir}/kmodtool
# rpmlint will complain this should be a noarch package; but for
# proper builddeps deps it needs to be a non-noarch package
-ExclusiveArch: i586 i686 x86_64 ppc ppc64
+ExclusiveArch: i586 i686 x86_64 ppc
# unneeded
%define debug_package %{nil}
+
%description
This package contains tools and lists of recent kernels that get used when
building kmod-packages.
+
%package kerneldevpkgs-newest
Summary: Meta-package to get newly released kernel-devel packages into the
buildroot
Group: Development/Tools
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
Obsoletes: buildsys-build-newest-kernels-livna < 17
-Provides: %{name}-kerneldevpkgs-newest-%{_target_cpu} =
%{?epoch:%{epoch}:}%{version}-%{release}
-
-Requires: %{_bindir}/kmodtool
-BuildRequires: %{_bindir}/kmodtool
+Provides: %{name}-kerneldevpkgs-newest-%{_target_cpu} = %{version}-%{release}
# we use our own magic here to safe ourself to cut'n'paste the BR
-%{expand:%(bash %{SOURCE2} --newest --requires --prefix %{_sourcedir}/%{name}-
2>/dev/null)}
+%{expand:%(bash %{SOURCE2} --newest --requires --buildrequires --prefix
%{_sourcedir}/%{name}- 2>/dev/null)}
%description kerneldevpkgs-newest
This is a meta-package used by the buildsystem to track the kernel-devel
packages for newly released kernels into the buildroot to build
kmods against them.
-%files kerneldevpkgs-newest
-%defattr(-,root,root,-)
-%doc .tmp/newest/README
-
%package kerneldevpkgs-current
Summary: Meta-package to get all current kernel-devel packages into the buildroot
Group: Development/Tools
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: %{name}-kerneldevpkgs-%{_target_cpu} =
%{?epoch:%{epoch}:}%{version}-%{release}
-Provides: %{name}-kerneldevpkgs-current-%{_target_cpu} =
%{?epoch:%{epoch}:}%{version}-%{release}
-
-Requires: %{_bindir}/kmodtool
-BuildRequires: %{_bindir}/kmodtool
+Provides: %{name}-kerneldevpkgs-current-%{_target_cpu} = %{version}-%{release}
+Requires: %{name}-kerneldevpkgs-newest-%{_target_cpu} = %{version}-%{release}
+Obsoletes: buildsys-build-current-kernels-livna < 17
# we use our own magic here to safe ourself to cut'n'paste the BR
-%{expand:%(bash %{SOURCE2} --current --requires --prefix %{_sourcedir}/%{name}-
2>/dev/null)}
+%{expand:%(bash %{SOURCE2} --current --requires --buildrequires --prefix
%{_sourcedir}/%{name}- 2>/dev/null)}
%description kerneldevpkgs-current
This is a meta-package used by the buildsystem to track the kernel-devel
packages for all current up-to-date kernels into the buildroot to build
kmods against them.
-%files kerneldevpkgs-current
-%defattr(-,root,root,-)
-%doc .tmp/current/README
%prep
# for debugging purposes output the stuff we use during the rpm generation
-bash %{SOURCE2} --newest --requires --prefix %{_sourcedir}/%{name}-
+bash %{SOURCE2} --newest --requires --buildrequires --prefix %{_sourcedir}/%{name}- |
grep -v '^Requires'
sleep 2
-bash %{SOURCE2} --current --requires --prefix %{_sourcedir}/%{name}-
+bash %{SOURCE2} --current --requires --buildrequires --prefix %{_sourcedir}/%{name}- |
grep -v '^Requires'
sleep 2
@@ -94,6 +83,10 @@
rm -rf $RPM_BUILD_ROOT .tmp/
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name} $RPM_BUILD_ROOT/%{_bindir} .tmp/newest
.tmp/current
+# can be used as auto-incremental counter in kmod pacakges release field
+# -- just remember to increase %%{version} everytime!
+echo ".%{version}" > $RPM_BUILD_ROOT/%{_datadir}/%{name}/counter
+
# install the stuff we need
install -p -m 0755 %{SOURCE2} $RPM_BUILD_ROOT/%{_bindir}/%{name}-kerneldevpkgs
install -p -m 0644 %{SOURCE5} .tmp/newest/README
@@ -120,9 +113,19 @@
%{_bindir}/*
%{_datadir}/%{name}/
+%files kerneldevpkgs-newest
+%defattr(-,root,root,-)
+%doc .tmp/newest/README
+
+%files kerneldevpkgs-current
+%defattr(-,root,root,-)
+%doc .tmp/current/README
%changelog
+* Thu Oct 02 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 42-1
+- Rebuild for RPM Fusion
+
* Thu Oct 02 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 41-1
- Rebuild for RPM Fusion