From f2462e75e77f61e833975150743a2c0e61b06360385b3c7d728046954b003f06 Mon Sep 17 00:00:00 2001 From: Michal Marek Date: Fri, 17 Jun 2011 05:02:50 +0000 Subject: [PATCH] GIT Revision: bc3a79d83165d5cca2759b0e4d3ec1427d5058fa OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-source?expand=0&rev=6994 --- config.tar.bz2 | 4 ++-- kernel-binary.spec.in | 10 +++++----- kernel-debug.changes | 33 +++++++++++++++++++++++++++++++++ kernel-debug.spec | 31 ++++++++++++++++++++++++++----- kernel-default.changes | 33 +++++++++++++++++++++++++++++++++ kernel-default.spec | 31 ++++++++++++++++++++++++++----- kernel-desktop.changes | 33 +++++++++++++++++++++++++++++++++ kernel-desktop.spec | 31 ++++++++++++++++++++++++++----- kernel-docs.changes | 33 +++++++++++++++++++++++++++++++++ kernel-docs.spec | 21 +++++++++++++++++++++ kernel-pae.changes | 33 +++++++++++++++++++++++++++++++++ kernel-pae.spec | 31 ++++++++++++++++++++++++++----- kernel-ppc64.changes | 33 +++++++++++++++++++++++++++++++++ kernel-ppc64.spec | 31 ++++++++++++++++++++++++++----- kernel-ps3.changes | 33 +++++++++++++++++++++++++++++++++ kernel-ps3.spec | 31 ++++++++++++++++++++++++++----- kernel-s390.changes | 33 +++++++++++++++++++++++++++++++++ kernel-s390.spec | 31 ++++++++++++++++++++++++++----- kernel-source.changes | 33 +++++++++++++++++++++++++++++++++ kernel-source.spec | 21 +++++++++++++++++++++ kernel-syms.changes | 33 +++++++++++++++++++++++++++++++++ kernel-syms.spec | 21 +++++++++++++++++++++ kernel-trace.changes | 33 +++++++++++++++++++++++++++++++++ kernel-trace.spec | 31 ++++++++++++++++++++++++++----- kernel-vanilla.changes | 33 +++++++++++++++++++++++++++++++++ kernel-vanilla.spec | 31 ++++++++++++++++++++++++++----- patches.fixes.tar.bz2 | 4 ++-- patches.suse.tar.bz2 | 4 ++-- series.conf | 9 --------- source-timestamp | 4 ++-- 30 files changed, 706 insertions(+), 67 deletions(-) diff --git a/config.tar.bz2 b/config.tar.bz2 index a76d6580..de9acbbf 100644 --- a/config.tar.bz2 +++ b/config.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4804868bc71726e41b34375279faae2645a524d51aa382723d43f4aadb7f50c9 -size 217544 +oid sha256:d8f932c61ed86e811a5c83cc8ee0caf1820f732b3004b3a797d2d72e0f5419c1 +size 217684 diff --git a/kernel-binary.spec.in b/kernel-binary.spec.in index 2080f84a..88406ce6 100644 --- a/kernel-binary.spec.in +++ b/kernel-binary.spec.in @@ -284,22 +284,22 @@ if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then %_sourcedir/modversions --unpack . < $_ fi -# If the %jobs macro is defined to a number, make will spawn that many jobs. +# The %{_smp_mflags} macro is defined to a number, make will spawn that many jobs. # There are several ways how to define it: # If you are using the build script: # build --jobs=N kernel-$flavor.spec # With plain rpmbuild: # rpmbuild -ba --define 'jobs N' kernel-$flavor.spec # To spawn as many jobs as there are cpu cores: -# rpmbuild -ba --define "jobs 0$(grep -c ^processor /proc/cpuinfo)" \ +# rpmbuild -ba --define "%_smp_mflags -j 0$(grep -Ec 'cpu[0-9]' /proc/stat)" \ # kernel-$flavor.spec # You can also set this permanently in ~/.rpmmacros: -# %jobs 0%(grep -c ^processor /proc/cpuinfo) +# %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat) %if %CONFIG_KMSG_IDS == "y" chmod +x ../linux-%srcversion/scripts/kmsg-doc - make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 + make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 %else - make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y + make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y %endif diff --git a/kernel-debug.changes b/kernel-debug.changes index 0cd92d35..dc434e77 100644 --- a/kernel-debug.changes +++ b/kernel-debug.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Thu Jun 16 12:16:16 CEST 2011 - mmarek@suse.cz + +- Remove the novfs patches, it should be packaged as a KMP, or + ideally, reimplemented as a fuse filesystem (which is the reason why + the current implementation it is never going to be accepted upstream). +- Delete patches.fixes/novfs-copy_user-fixes.diff. +- Delete patches.fixes/novfs-minsize-fixes. +- Delete patches.fixes/novfs-nwcapi.patch. +- Delete patches.suse/novfs-client-module. +- Delete patches.suse/novfs-remove-bkl. +- commit bc3a79d + +------------------------------------------------------------------- +Thu Jun 16 12:04:56 CEST 2011 - ohering@suse.de + +- Update vanilla config files. +- commit a642909 + +------------------------------------------------------------------- +Thu Jun 16 11:50:58 CEST 2011 - ohering@suse.de + +- rpm/kernel-binary.spec.in: + jobs is not defined for home: projects, use the new _smp_mflags to enable parallel build +- commit c5eda95 + +------------------------------------------------------------------- +Thu Jun 16 11:27:44 CEST 2011 - ohering@suse.de + +- rpm/kernel-binary.spec.in: + Update comment, get the number of cpus from /proc/stat +- commit 83ed0d0 + ------------------------------------------------------------------- Wed Jun 15 20:40:28 CEST 2011 - jeffm@suse.com diff --git a/kernel-debug.spec b/kernel-debug.spec index 24d6f015..33ce0138 100644 --- a/kernel-debug.spec +++ b/kernel-debug.spec @@ -361,22 +361,22 @@ if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then %_sourcedir/modversions --unpack . < $_ fi -# If the %jobs macro is defined to a number, make will spawn that many jobs. +# The %{_smp_mflags} macro is defined to a number, make will spawn that many jobs. # There are several ways how to define it: # If you are using the build script: # build --jobs=N kernel-$flavor.spec # With plain rpmbuild: # rpmbuild -ba --define 'jobs N' kernel-$flavor.spec # To spawn as many jobs as there are cpu cores: -# rpmbuild -ba --define "jobs 0$(grep -c ^processor /proc/cpuinfo)" \ +# rpmbuild -ba --define "%_smp_mflags -j 0$(grep -Ec 'cpu[0-9]' /proc/stat)" \ # kernel-$flavor.spec # You can also set this permanently in ~/.rpmmacros: -# %jobs 0%(grep -c ^processor /proc/cpuinfo) +# %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat) %if %CONFIG_KMSG_IDS == "y" chmod +x ../linux-%srcversion/scripts/kmsg-doc - make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 + make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 %else - make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y + make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y %endif @@ -875,6 +875,27 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Thu Jun 16 2011 mmarek@suse.cz +- Remove the novfs patches, it should be packaged as a KMP, or + ideally, reimplemented as a fuse filesystem (which is the reason why + the current implementation it is never going to be accepted upstream). +- Delete patches.fixes/novfs-copy_user-fixes.diff. +- Delete patches.fixes/novfs-minsize-fixes. +- Delete patches.fixes/novfs-nwcapi.patch. +- Delete patches.suse/novfs-client-module. +- Delete patches.suse/novfs-remove-bkl. +- commit bc3a79d +* Thu Jun 16 2011 ohering@suse.de +- Update vanilla config files. +- commit a642909 +* Thu Jun 16 2011 ohering@suse.de +- rpm/kernel-binary.spec.in: + jobs is not defined for home: projects, use the new _smp_mflags to enable parallel build +- commit c5eda95 +* Thu Jun 16 2011 ohering@suse.de +- rpm/kernel-binary.spec.in: + Update comment, get the number of cpus from /proc/stat +- commit 83ed0d0 * Wed Jun 15 2011 jeffm@suse.com - Update config files: Disable BRCMSMAC on ppc/ppc64. - commit 20b3d8e diff --git a/kernel-default.changes b/kernel-default.changes index 0cd92d35..dc434e77 100644 --- a/kernel-default.changes +++ b/kernel-default.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Thu Jun 16 12:16:16 CEST 2011 - mmarek@suse.cz + +- Remove the novfs patches, it should be packaged as a KMP, or + ideally, reimplemented as a fuse filesystem (which is the reason why + the current implementation it is never going to be accepted upstream). +- Delete patches.fixes/novfs-copy_user-fixes.diff. +- Delete patches.fixes/novfs-minsize-fixes. +- Delete patches.fixes/novfs-nwcapi.patch. +- Delete patches.suse/novfs-client-module. +- Delete patches.suse/novfs-remove-bkl. +- commit bc3a79d + +------------------------------------------------------------------- +Thu Jun 16 12:04:56 CEST 2011 - ohering@suse.de + +- Update vanilla config files. +- commit a642909 + +------------------------------------------------------------------- +Thu Jun 16 11:50:58 CEST 2011 - ohering@suse.de + +- rpm/kernel-binary.spec.in: + jobs is not defined for home: projects, use the new _smp_mflags to enable parallel build +- commit c5eda95 + +------------------------------------------------------------------- +Thu Jun 16 11:27:44 CEST 2011 - ohering@suse.de + +- rpm/kernel-binary.spec.in: + Update comment, get the number of cpus from /proc/stat +- commit 83ed0d0 + ------------------------------------------------------------------- Wed Jun 15 20:40:28 CEST 2011 - jeffm@suse.com diff --git a/kernel-default.spec b/kernel-default.spec index 48140375..97634ffd 100644 --- a/kernel-default.spec +++ b/kernel-default.spec @@ -376,22 +376,22 @@ if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then %_sourcedir/modversions --unpack . < $_ fi -# If the %jobs macro is defined to a number, make will spawn that many jobs. +# The %{_smp_mflags} macro is defined to a number, make will spawn that many jobs. # There are several ways how to define it: # If you are using the build script: # build --jobs=N kernel-$flavor.spec # With plain rpmbuild: # rpmbuild -ba --define 'jobs N' kernel-$flavor.spec # To spawn as many jobs as there are cpu cores: -# rpmbuild -ba --define "jobs 0$(grep -c ^processor /proc/cpuinfo)" \ +# rpmbuild -ba --define "%_smp_mflags -j 0$(grep -Ec 'cpu[0-9]' /proc/stat)" \ # kernel-$flavor.spec # You can also set this permanently in ~/.rpmmacros: -# %jobs 0%(grep -c ^processor /proc/cpuinfo) +# %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat) %if %CONFIG_KMSG_IDS == "y" chmod +x ../linux-%srcversion/scripts/kmsg-doc - make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 + make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 %else - make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y + make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y %endif @@ -888,6 +888,27 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Thu Jun 16 2011 mmarek@suse.cz +- Remove the novfs patches, it should be packaged as a KMP, or + ideally, reimplemented as a fuse filesystem (which is the reason why + the current implementation it is never going to be accepted upstream). +- Delete patches.fixes/novfs-copy_user-fixes.diff. +- Delete patches.fixes/novfs-minsize-fixes. +- Delete patches.fixes/novfs-nwcapi.patch. +- Delete patches.suse/novfs-client-module. +- Delete patches.suse/novfs-remove-bkl. +- commit bc3a79d +* Thu Jun 16 2011 ohering@suse.de +- Update vanilla config files. +- commit a642909 +* Thu Jun 16 2011 ohering@suse.de +- rpm/kernel-binary.spec.in: + jobs is not defined for home: projects, use the new _smp_mflags to enable parallel build +- commit c5eda95 +* Thu Jun 16 2011 ohering@suse.de +- rpm/kernel-binary.spec.in: + Update comment, get the number of cpus from /proc/stat +- commit 83ed0d0 * Wed Jun 15 2011 jeffm@suse.com - Update config files: Disable BRCMSMAC on ppc/ppc64. - commit 20b3d8e diff --git a/kernel-desktop.changes b/kernel-desktop.changes index 0cd92d35..dc434e77 100644 --- a/kernel-desktop.changes +++ b/kernel-desktop.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Thu Jun 16 12:16:16 CEST 2011 - mmarek@suse.cz + +- Remove the novfs patches, it should be packaged as a KMP, or + ideally, reimplemented as a fuse filesystem (which is the reason why + the current implementation it is never going to be accepted upstream). +- Delete patches.fixes/novfs-copy_user-fixes.diff. +- Delete patches.fixes/novfs-minsize-fixes. +- Delete patches.fixes/novfs-nwcapi.patch. +- Delete patches.suse/novfs-client-module. +- Delete patches.suse/novfs-remove-bkl. +- commit bc3a79d + +------------------------------------------------------------------- +Thu Jun 16 12:04:56 CEST 2011 - ohering@suse.de + +- Update vanilla config files. +- commit a642909 + +------------------------------------------------------------------- +Thu Jun 16 11:50:58 CEST 2011 - ohering@suse.de + +- rpm/kernel-binary.spec.in: + jobs is not defined for home: projects, use the new _smp_mflags to enable parallel build +- commit c5eda95 + +------------------------------------------------------------------- +Thu Jun 16 11:27:44 CEST 2011 - ohering@suse.de + +- rpm/kernel-binary.spec.in: + Update comment, get the number of cpus from /proc/stat +- commit 83ed0d0 + ------------------------------------------------------------------- Wed Jun 15 20:40:28 CEST 2011 - jeffm@suse.com diff --git a/kernel-desktop.spec b/kernel-desktop.spec index 0404b920..ee3b9109 100644 --- a/kernel-desktop.spec +++ b/kernel-desktop.spec @@ -370,22 +370,22 @@ if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then %_sourcedir/modversions --unpack . < $_ fi -# If the %jobs macro is defined to a number, make will spawn that many jobs. +# The %{_smp_mflags} macro is defined to a number, make will spawn that many jobs. # There are several ways how to define it: # If you are using the build script: # build --jobs=N kernel-$flavor.spec # With plain rpmbuild: # rpmbuild -ba --define 'jobs N' kernel-$flavor.spec # To spawn as many jobs as there are cpu cores: -# rpmbuild -ba --define "jobs 0$(grep -c ^processor /proc/cpuinfo)" \ +# rpmbuild -ba --define "%_smp_mflags -j 0$(grep -Ec 'cpu[0-9]' /proc/stat)" \ # kernel-$flavor.spec # You can also set this permanently in ~/.rpmmacros: -# %jobs 0%(grep -c ^processor /proc/cpuinfo) +# %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat) %if %CONFIG_KMSG_IDS == "y" chmod +x ../linux-%srcversion/scripts/kmsg-doc - make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 + make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 %else - make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y + make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y %endif @@ -908,6 +908,27 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Thu Jun 16 2011 mmarek@suse.cz +- Remove the novfs patches, it should be packaged as a KMP, or + ideally, reimplemented as a fuse filesystem (which is the reason why + the current implementation it is never going to be accepted upstream). +- Delete patches.fixes/novfs-copy_user-fixes.diff. +- Delete patches.fixes/novfs-minsize-fixes. +- Delete patches.fixes/novfs-nwcapi.patch. +- Delete patches.suse/novfs-client-module. +- Delete patches.suse/novfs-remove-bkl. +- commit bc3a79d +* Thu Jun 16 2011 ohering@suse.de +- Update vanilla config files. +- commit a642909 +* Thu Jun 16 2011 ohering@suse.de +- rpm/kernel-binary.spec.in: + jobs is not defined for home: projects, use the new _smp_mflags to enable parallel build +- commit c5eda95 +* Thu Jun 16 2011 ohering@suse.de +- rpm/kernel-binary.spec.in: + Update comment, get the number of cpus from /proc/stat +- commit 83ed0d0 * Wed Jun 15 2011 jeffm@suse.com - Update config files: Disable BRCMSMAC on ppc/ppc64. - commit 20b3d8e diff --git a/kernel-docs.changes b/kernel-docs.changes index 0cd92d35..dc434e77 100644 --- a/kernel-docs.changes +++ b/kernel-docs.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Thu Jun 16 12:16:16 CEST 2011 - mmarek@suse.cz + +- Remove the novfs patches, it should be packaged as a KMP, or + ideally, reimplemented as a fuse filesystem (which is the reason why + the current implementation it is never going to be accepted upstream). +- Delete patches.fixes/novfs-copy_user-fixes.diff. +- Delete patches.fixes/novfs-minsize-fixes. +- Delete patches.fixes/novfs-nwcapi.patch. +- Delete patches.suse/novfs-client-module. +- Delete patches.suse/novfs-remove-bkl. +- commit bc3a79d + +------------------------------------------------------------------- +Thu Jun 16 12:04:56 CEST 2011 - ohering@suse.de + +- Update vanilla config files. +- commit a642909 + +------------------------------------------------------------------- +Thu Jun 16 11:50:58 CEST 2011 - ohering@suse.de + +- rpm/kernel-binary.spec.in: + jobs is not defined for home: projects, use the new _smp_mflags to enable parallel build +- commit c5eda95 + +------------------------------------------------------------------- +Thu Jun 16 11:27:44 CEST 2011 - ohering@suse.de + +- rpm/kernel-binary.spec.in: + Update comment, get the number of cpus from /proc/stat +- commit 83ed0d0 + ------------------------------------------------------------------- Wed Jun 15 20:40:28 CEST 2011 - jeffm@suse.com diff --git a/kernel-docs.spec b/kernel-docs.spec index cea6d7d6..81718658 100644 --- a/kernel-docs.spec +++ b/kernel-docs.spec @@ -99,6 +99,27 @@ rm -rf $RPM_BUILD_ROOT /usr/share/doc/kernel %changelog +* Thu Jun 16 2011 mmarek@suse.cz +- Remove the novfs patches, it should be packaged as a KMP, or + ideally, reimplemented as a fuse filesystem (which is the reason why + the current implementation it is never going to be accepted upstream). +- Delete patches.fixes/novfs-copy_user-fixes.diff. +- Delete patches.fixes/novfs-minsize-fixes. +- Delete patches.fixes/novfs-nwcapi.patch. +- Delete patches.suse/novfs-client-module. +- Delete patches.suse/novfs-remove-bkl. +- commit bc3a79d +* Thu Jun 16 2011 ohering@suse.de +- Update vanilla config files. +- commit a642909 +* Thu Jun 16 2011 ohering@suse.de +- rpm/kernel-binary.spec.in: + jobs is not defined for home: projects, use the new _smp_mflags to enable parallel build +- commit c5eda95 +* Thu Jun 16 2011 ohering@suse.de +- rpm/kernel-binary.spec.in: + Update comment, get the number of cpus from /proc/stat +- commit 83ed0d0 * Wed Jun 15 2011 jeffm@suse.com - Update config files: Disable BRCMSMAC on ppc/ppc64. - commit 20b3d8e diff --git a/kernel-pae.changes b/kernel-pae.changes index 0cd92d35..dc434e77 100644 --- a/kernel-pae.changes +++ b/kernel-pae.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Thu Jun 16 12:16:16 CEST 2011 - mmarek@suse.cz + +- Remove the novfs patches, it should be packaged as a KMP, or + ideally, reimplemented as a fuse filesystem (which is the reason why + the current implementation it is never going to be accepted upstream). +- Delete patches.fixes/novfs-copy_user-fixes.diff. +- Delete patches.fixes/novfs-minsize-fixes. +- Delete patches.fixes/novfs-nwcapi.patch. +- Delete patches.suse/novfs-client-module. +- Delete patches.suse/novfs-remove-bkl. +- commit bc3a79d + +------------------------------------------------------------------- +Thu Jun 16 12:04:56 CEST 2011 - ohering@suse.de + +- Update vanilla config files. +- commit a642909 + +------------------------------------------------------------------- +Thu Jun 16 11:50:58 CEST 2011 - ohering@suse.de + +- rpm/kernel-binary.spec.in: + jobs is not defined for home: projects, use the new _smp_mflags to enable parallel build +- commit c5eda95 + +------------------------------------------------------------------- +Thu Jun 16 11:27:44 CEST 2011 - ohering@suse.de + +- rpm/kernel-binary.spec.in: + Update comment, get the number of cpus from /proc/stat +- commit 83ed0d0 + ------------------------------------------------------------------- Wed Jun 15 20:40:28 CEST 2011 - jeffm@suse.com diff --git a/kernel-pae.spec b/kernel-pae.spec index 1fce2ab0..9e97b647 100644 --- a/kernel-pae.spec +++ b/kernel-pae.spec @@ -367,22 +367,22 @@ if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then %_sourcedir/modversions --unpack . < $_ fi -# If the %jobs macro is defined to a number, make will spawn that many jobs. +# The %{_smp_mflags} macro is defined to a number, make will spawn that many jobs. # There are several ways how to define it: # If you are using the build script: # build --jobs=N kernel-$flavor.spec # With plain rpmbuild: # rpmbuild -ba --define 'jobs N' kernel-$flavor.spec # To spawn as many jobs as there are cpu cores: -# rpmbuild -ba --define "jobs 0$(grep -c ^processor /proc/cpuinfo)" \ +# rpmbuild -ba --define "%_smp_mflags -j 0$(grep -Ec 'cpu[0-9]' /proc/stat)" \ # kernel-$flavor.spec # You can also set this permanently in ~/.rpmmacros: -# %jobs 0%(grep -c ^processor /proc/cpuinfo) +# %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat) %if %CONFIG_KMSG_IDS == "y" chmod +x ../linux-%srcversion/scripts/kmsg-doc - make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 + make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 %else - make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y + make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y %endif @@ -893,6 +893,27 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Thu Jun 16 2011 mmarek@suse.cz +- Remove the novfs patches, it should be packaged as a KMP, or + ideally, reimplemented as a fuse filesystem (which is the reason why + the current implementation it is never going to be accepted upstream). +- Delete patches.fixes/novfs-copy_user-fixes.diff. +- Delete patches.fixes/novfs-minsize-fixes. +- Delete patches.fixes/novfs-nwcapi.patch. +- Delete patches.suse/novfs-client-module. +- Delete patches.suse/novfs-remove-bkl. +- commit bc3a79d +* Thu Jun 16 2011 ohering@suse.de +- Update vanilla config files. +- commit a642909 +* Thu Jun 16 2011 ohering@suse.de +- rpm/kernel-binary.spec.in: + jobs is not defined for home: projects, use the new _smp_mflags to enable parallel build +- commit c5eda95 +* Thu Jun 16 2011 ohering@suse.de +- rpm/kernel-binary.spec.in: + Update comment, get the number of cpus from /proc/stat +- commit 83ed0d0 * Wed Jun 15 2011 jeffm@suse.com - Update config files: Disable BRCMSMAC on ppc/ppc64. - commit 20b3d8e diff --git a/kernel-ppc64.changes b/kernel-ppc64.changes index 0cd92d35..dc434e77 100644 --- a/kernel-ppc64.changes +++ b/kernel-ppc64.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Thu Jun 16 12:16:16 CEST 2011 - mmarek@suse.cz + +- Remove the novfs patches, it should be packaged as a KMP, or + ideally, reimplemented as a fuse filesystem (which is the reason why + the current implementation it is never going to be accepted upstream). +- Delete patches.fixes/novfs-copy_user-fixes.diff. +- Delete patches.fixes/novfs-minsize-fixes. +- Delete patches.fixes/novfs-nwcapi.patch. +- Delete patches.suse/novfs-client-module. +- Delete patches.suse/novfs-remove-bkl. +- commit bc3a79d + +------------------------------------------------------------------- +Thu Jun 16 12:04:56 CEST 2011 - ohering@suse.de + +- Update vanilla config files. +- commit a642909 + +------------------------------------------------------------------- +Thu Jun 16 11:50:58 CEST 2011 - ohering@suse.de + +- rpm/kernel-binary.spec.in: + jobs is not defined for home: projects, use the new _smp_mflags to enable parallel build +- commit c5eda95 + +------------------------------------------------------------------- +Thu Jun 16 11:27:44 CEST 2011 - ohering@suse.de + +- rpm/kernel-binary.spec.in: + Update comment, get the number of cpus from /proc/stat +- commit 83ed0d0 + ------------------------------------------------------------------- Wed Jun 15 20:40:28 CEST 2011 - jeffm@suse.com diff --git a/kernel-ppc64.spec b/kernel-ppc64.spec index b9c78edf..803a5b5e 100644 --- a/kernel-ppc64.spec +++ b/kernel-ppc64.spec @@ -371,22 +371,22 @@ if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then %_sourcedir/modversions --unpack . < $_ fi -# If the %jobs macro is defined to a number, make will spawn that many jobs. +# The %{_smp_mflags} macro is defined to a number, make will spawn that many jobs. # There are several ways how to define it: # If you are using the build script: # build --jobs=N kernel-$flavor.spec # With plain rpmbuild: # rpmbuild -ba --define 'jobs N' kernel-$flavor.spec # To spawn as many jobs as there are cpu cores: -# rpmbuild -ba --define "jobs 0$(grep -c ^processor /proc/cpuinfo)" \ +# rpmbuild -ba --define "%_smp_mflags -j 0$(grep -Ec 'cpu[0-9]' /proc/stat)" \ # kernel-$flavor.spec # You can also set this permanently in ~/.rpmmacros: -# %jobs 0%(grep -c ^processor /proc/cpuinfo) +# %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat) %if %CONFIG_KMSG_IDS == "y" chmod +x ../linux-%srcversion/scripts/kmsg-doc - make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 + make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 %else - make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y + make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y %endif @@ -897,6 +897,27 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Thu Jun 16 2011 mmarek@suse.cz +- Remove the novfs patches, it should be packaged as a KMP, or + ideally, reimplemented as a fuse filesystem (which is the reason why + the current implementation it is never going to be accepted upstream). +- Delete patches.fixes/novfs-copy_user-fixes.diff. +- Delete patches.fixes/novfs-minsize-fixes. +- Delete patches.fixes/novfs-nwcapi.patch. +- Delete patches.suse/novfs-client-module. +- Delete patches.suse/novfs-remove-bkl. +- commit bc3a79d +* Thu Jun 16 2011 ohering@suse.de +- Update vanilla config files. +- commit a642909 +* Thu Jun 16 2011 ohering@suse.de +- rpm/kernel-binary.spec.in: + jobs is not defined for home: projects, use the new _smp_mflags to enable parallel build +- commit c5eda95 +* Thu Jun 16 2011 ohering@suse.de +- rpm/kernel-binary.spec.in: + Update comment, get the number of cpus from /proc/stat +- commit 83ed0d0 * Wed Jun 15 2011 jeffm@suse.com - Update config files: Disable BRCMSMAC on ppc/ppc64. - commit 20b3d8e diff --git a/kernel-ps3.changes b/kernel-ps3.changes index 0cd92d35..dc434e77 100644 --- a/kernel-ps3.changes +++ b/kernel-ps3.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Thu Jun 16 12:16:16 CEST 2011 - mmarek@suse.cz + +- Remove the novfs patches, it should be packaged as a KMP, or + ideally, reimplemented as a fuse filesystem (which is the reason why + the current implementation it is never going to be accepted upstream). +- Delete patches.fixes/novfs-copy_user-fixes.diff. +- Delete patches.fixes/novfs-minsize-fixes. +- Delete patches.fixes/novfs-nwcapi.patch. +- Delete patches.suse/novfs-client-module. +- Delete patches.suse/novfs-remove-bkl. +- commit bc3a79d + +------------------------------------------------------------------- +Thu Jun 16 12:04:56 CEST 2011 - ohering@suse.de + +- Update vanilla config files. +- commit a642909 + +------------------------------------------------------------------- +Thu Jun 16 11:50:58 CEST 2011 - ohering@suse.de + +- rpm/kernel-binary.spec.in: + jobs is not defined for home: projects, use the new _smp_mflags to enable parallel build +- commit c5eda95 + +------------------------------------------------------------------- +Thu Jun 16 11:27:44 CEST 2011 - ohering@suse.de + +- rpm/kernel-binary.spec.in: + Update comment, get the number of cpus from /proc/stat +- commit 83ed0d0 + ------------------------------------------------------------------- Wed Jun 15 20:40:28 CEST 2011 - jeffm@suse.com diff --git a/kernel-ps3.spec b/kernel-ps3.spec index 16d95dd7..5553b61a 100644 --- a/kernel-ps3.spec +++ b/kernel-ps3.spec @@ -360,22 +360,22 @@ if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then %_sourcedir/modversions --unpack . < $_ fi -# If the %jobs macro is defined to a number, make will spawn that many jobs. +# The %{_smp_mflags} macro is defined to a number, make will spawn that many jobs. # There are several ways how to define it: # If you are using the build script: # build --jobs=N kernel-$flavor.spec # With plain rpmbuild: # rpmbuild -ba --define 'jobs N' kernel-$flavor.spec # To spawn as many jobs as there are cpu cores: -# rpmbuild -ba --define "jobs 0$(grep -c ^processor /proc/cpuinfo)" \ +# rpmbuild -ba --define "%_smp_mflags -j 0$(grep -Ec 'cpu[0-9]' /proc/stat)" \ # kernel-$flavor.spec # You can also set this permanently in ~/.rpmmacros: -# %jobs 0%(grep -c ^processor /proc/cpuinfo) +# %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat) %if %CONFIG_KMSG_IDS == "y" chmod +x ../linux-%srcversion/scripts/kmsg-doc - make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 + make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 %else - make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y + make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y %endif @@ -878,6 +878,27 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Thu Jun 16 2011 mmarek@suse.cz +- Remove the novfs patches, it should be packaged as a KMP, or + ideally, reimplemented as a fuse filesystem (which is the reason why + the current implementation it is never going to be accepted upstream). +- Delete patches.fixes/novfs-copy_user-fixes.diff. +- Delete patches.fixes/novfs-minsize-fixes. +- Delete patches.fixes/novfs-nwcapi.patch. +- Delete patches.suse/novfs-client-module. +- Delete patches.suse/novfs-remove-bkl. +- commit bc3a79d +* Thu Jun 16 2011 ohering@suse.de +- Update vanilla config files. +- commit a642909 +* Thu Jun 16 2011 ohering@suse.de +- rpm/kernel-binary.spec.in: + jobs is not defined for home: projects, use the new _smp_mflags to enable parallel build +- commit c5eda95 +* Thu Jun 16 2011 ohering@suse.de +- rpm/kernel-binary.spec.in: + Update comment, get the number of cpus from /proc/stat +- commit 83ed0d0 * Wed Jun 15 2011 jeffm@suse.com - Update config files: Disable BRCMSMAC on ppc/ppc64. - commit 20b3d8e diff --git a/kernel-s390.changes b/kernel-s390.changes index 0cd92d35..dc434e77 100644 --- a/kernel-s390.changes +++ b/kernel-s390.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Thu Jun 16 12:16:16 CEST 2011 - mmarek@suse.cz + +- Remove the novfs patches, it should be packaged as a KMP, or + ideally, reimplemented as a fuse filesystem (which is the reason why + the current implementation it is never going to be accepted upstream). +- Delete patches.fixes/novfs-copy_user-fixes.diff. +- Delete patches.fixes/novfs-minsize-fixes. +- Delete patches.fixes/novfs-nwcapi.patch. +- Delete patches.suse/novfs-client-module. +- Delete patches.suse/novfs-remove-bkl. +- commit bc3a79d + +------------------------------------------------------------------- +Thu Jun 16 12:04:56 CEST 2011 - ohering@suse.de + +- Update vanilla config files. +- commit a642909 + +------------------------------------------------------------------- +Thu Jun 16 11:50:58 CEST 2011 - ohering@suse.de + +- rpm/kernel-binary.spec.in: + jobs is not defined for home: projects, use the new _smp_mflags to enable parallel build +- commit c5eda95 + +------------------------------------------------------------------- +Thu Jun 16 11:27:44 CEST 2011 - ohering@suse.de + +- rpm/kernel-binary.spec.in: + Update comment, get the number of cpus from /proc/stat +- commit 83ed0d0 + ------------------------------------------------------------------- Wed Jun 15 20:40:28 CEST 2011 - jeffm@suse.com diff --git a/kernel-s390.spec b/kernel-s390.spec index 719bba3b..1014b7e9 100644 --- a/kernel-s390.spec +++ b/kernel-s390.spec @@ -360,22 +360,22 @@ if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then %_sourcedir/modversions --unpack . < $_ fi -# If the %jobs macro is defined to a number, make will spawn that many jobs. +# The %{_smp_mflags} macro is defined to a number, make will spawn that many jobs. # There are several ways how to define it: # If you are using the build script: # build --jobs=N kernel-$flavor.spec # With plain rpmbuild: # rpmbuild -ba --define 'jobs N' kernel-$flavor.spec # To spawn as many jobs as there are cpu cores: -# rpmbuild -ba --define "jobs 0$(grep -c ^processor /proc/cpuinfo)" \ +# rpmbuild -ba --define "%_smp_mflags -j 0$(grep -Ec 'cpu[0-9]' /proc/stat)" \ # kernel-$flavor.spec # You can also set this permanently in ~/.rpmmacros: -# %jobs 0%(grep -c ^processor /proc/cpuinfo) +# %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat) %if %CONFIG_KMSG_IDS == "y" chmod +x ../linux-%srcversion/scripts/kmsg-doc - make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 + make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 %else - make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y + make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y %endif @@ -872,6 +872,27 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Thu Jun 16 2011 mmarek@suse.cz +- Remove the novfs patches, it should be packaged as a KMP, or + ideally, reimplemented as a fuse filesystem (which is the reason why + the current implementation it is never going to be accepted upstream). +- Delete patches.fixes/novfs-copy_user-fixes.diff. +- Delete patches.fixes/novfs-minsize-fixes. +- Delete patches.fixes/novfs-nwcapi.patch. +- Delete patches.suse/novfs-client-module. +- Delete patches.suse/novfs-remove-bkl. +- commit bc3a79d +* Thu Jun 16 2011 ohering@suse.de +- Update vanilla config files. +- commit a642909 +* Thu Jun 16 2011 ohering@suse.de +- rpm/kernel-binary.spec.in: + jobs is not defined for home: projects, use the new _smp_mflags to enable parallel build +- commit c5eda95 +* Thu Jun 16 2011 ohering@suse.de +- rpm/kernel-binary.spec.in: + Update comment, get the number of cpus from /proc/stat +- commit 83ed0d0 * Wed Jun 15 2011 jeffm@suse.com - Update config files: Disable BRCMSMAC on ppc/ppc64. - commit 20b3d8e diff --git a/kernel-source.changes b/kernel-source.changes index 0cd92d35..dc434e77 100644 --- a/kernel-source.changes +++ b/kernel-source.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Thu Jun 16 12:16:16 CEST 2011 - mmarek@suse.cz + +- Remove the novfs patches, it should be packaged as a KMP, or + ideally, reimplemented as a fuse filesystem (which is the reason why + the current implementation it is never going to be accepted upstream). +- Delete patches.fixes/novfs-copy_user-fixes.diff. +- Delete patches.fixes/novfs-minsize-fixes. +- Delete patches.fixes/novfs-nwcapi.patch. +- Delete patches.suse/novfs-client-module. +- Delete patches.suse/novfs-remove-bkl. +- commit bc3a79d + +------------------------------------------------------------------- +Thu Jun 16 12:04:56 CEST 2011 - ohering@suse.de + +- Update vanilla config files. +- commit a642909 + +------------------------------------------------------------------- +Thu Jun 16 11:50:58 CEST 2011 - ohering@suse.de + +- rpm/kernel-binary.spec.in: + jobs is not defined for home: projects, use the new _smp_mflags to enable parallel build +- commit c5eda95 + +------------------------------------------------------------------- +Thu Jun 16 11:27:44 CEST 2011 - ohering@suse.de + +- rpm/kernel-binary.spec.in: + Update comment, get the number of cpus from /proc/stat +- commit 83ed0d0 + ------------------------------------------------------------------- Wed Jun 15 20:40:28 CEST 2011 - jeffm@suse.com diff --git a/kernel-source.spec b/kernel-source.spec index 20d2cd0f..1be8b4c5 100644 --- a/kernel-source.spec +++ b/kernel-source.spec @@ -255,6 +255,27 @@ find %buildroot/usr/src/linux* ! -type l | xargs touch -d "$ts" %endif %changelog +* Thu Jun 16 2011 mmarek@suse.cz +- Remove the novfs patches, it should be packaged as a KMP, or + ideally, reimplemented as a fuse filesystem (which is the reason why + the current implementation it is never going to be accepted upstream). +- Delete patches.fixes/novfs-copy_user-fixes.diff. +- Delete patches.fixes/novfs-minsize-fixes. +- Delete patches.fixes/novfs-nwcapi.patch. +- Delete patches.suse/novfs-client-module. +- Delete patches.suse/novfs-remove-bkl. +- commit bc3a79d +* Thu Jun 16 2011 ohering@suse.de +- Update vanilla config files. +- commit a642909 +* Thu Jun 16 2011 ohering@suse.de +- rpm/kernel-binary.spec.in: + jobs is not defined for home: projects, use the new _smp_mflags to enable parallel build +- commit c5eda95 +* Thu Jun 16 2011 ohering@suse.de +- rpm/kernel-binary.spec.in: + Update comment, get the number of cpus from /proc/stat +- commit 83ed0d0 * Wed Jun 15 2011 jeffm@suse.com - Update config files: Disable BRCMSMAC on ppc/ppc64. - commit 20b3d8e diff --git a/kernel-syms.changes b/kernel-syms.changes index 0cd92d35..dc434e77 100644 --- a/kernel-syms.changes +++ b/kernel-syms.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Thu Jun 16 12:16:16 CEST 2011 - mmarek@suse.cz + +- Remove the novfs patches, it should be packaged as a KMP, or + ideally, reimplemented as a fuse filesystem (which is the reason why + the current implementation it is never going to be accepted upstream). +- Delete patches.fixes/novfs-copy_user-fixes.diff. +- Delete patches.fixes/novfs-minsize-fixes. +- Delete patches.fixes/novfs-nwcapi.patch. +- Delete patches.suse/novfs-client-module. +- Delete patches.suse/novfs-remove-bkl. +- commit bc3a79d + +------------------------------------------------------------------- +Thu Jun 16 12:04:56 CEST 2011 - ohering@suse.de + +- Update vanilla config files. +- commit a642909 + +------------------------------------------------------------------- +Thu Jun 16 11:50:58 CEST 2011 - ohering@suse.de + +- rpm/kernel-binary.spec.in: + jobs is not defined for home: projects, use the new _smp_mflags to enable parallel build +- commit c5eda95 + +------------------------------------------------------------------- +Thu Jun 16 11:27:44 CEST 2011 - ohering@suse.de + +- rpm/kernel-binary.spec.in: + Update comment, get the number of cpus from /proc/stat +- commit 83ed0d0 + ------------------------------------------------------------------- Wed Jun 15 20:40:28 CEST 2011 - jeffm@suse.com diff --git a/kernel-syms.spec b/kernel-syms.spec index ffe52580..92f04e8a 100644 --- a/kernel-syms.spec +++ b/kernel-syms.spec @@ -78,6 +78,27 @@ install -m 644 -D %{SOURCE0} %buildroot/%_docdir/%name/README.SUSE %_docdir/%name/README.SUSE %changelog +* Thu Jun 16 2011 mmarek@suse.cz +- Remove the novfs patches, it should be packaged as a KMP, or + ideally, reimplemented as a fuse filesystem (which is the reason why + the current implementation it is never going to be accepted upstream). +- Delete patches.fixes/novfs-copy_user-fixes.diff. +- Delete patches.fixes/novfs-minsize-fixes. +- Delete patches.fixes/novfs-nwcapi.patch. +- Delete patches.suse/novfs-client-module. +- Delete patches.suse/novfs-remove-bkl. +- commit bc3a79d +* Thu Jun 16 2011 ohering@suse.de +- Update vanilla config files. +- commit a642909 +* Thu Jun 16 2011 ohering@suse.de +- rpm/kernel-binary.spec.in: + jobs is not defined for home: projects, use the new _smp_mflags to enable parallel build +- commit c5eda95 +* Thu Jun 16 2011 ohering@suse.de +- rpm/kernel-binary.spec.in: + Update comment, get the number of cpus from /proc/stat +- commit 83ed0d0 * Wed Jun 15 2011 jeffm@suse.com - Update config files: Disable BRCMSMAC on ppc/ppc64. - commit 20b3d8e diff --git a/kernel-trace.changes b/kernel-trace.changes index 0cd92d35..dc434e77 100644 --- a/kernel-trace.changes +++ b/kernel-trace.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Thu Jun 16 12:16:16 CEST 2011 - mmarek@suse.cz + +- Remove the novfs patches, it should be packaged as a KMP, or + ideally, reimplemented as a fuse filesystem (which is the reason why + the current implementation it is never going to be accepted upstream). +- Delete patches.fixes/novfs-copy_user-fixes.diff. +- Delete patches.fixes/novfs-minsize-fixes. +- Delete patches.fixes/novfs-nwcapi.patch. +- Delete patches.suse/novfs-client-module. +- Delete patches.suse/novfs-remove-bkl. +- commit bc3a79d + +------------------------------------------------------------------- +Thu Jun 16 12:04:56 CEST 2011 - ohering@suse.de + +- Update vanilla config files. +- commit a642909 + +------------------------------------------------------------------- +Thu Jun 16 11:50:58 CEST 2011 - ohering@suse.de + +- rpm/kernel-binary.spec.in: + jobs is not defined for home: projects, use the new _smp_mflags to enable parallel build +- commit c5eda95 + +------------------------------------------------------------------- +Thu Jun 16 11:27:44 CEST 2011 - ohering@suse.de + +- rpm/kernel-binary.spec.in: + Update comment, get the number of cpus from /proc/stat +- commit 83ed0d0 + ------------------------------------------------------------------- Wed Jun 15 20:40:28 CEST 2011 - jeffm@suse.com diff --git a/kernel-trace.spec b/kernel-trace.spec index f97dc515..14d4beb8 100644 --- a/kernel-trace.spec +++ b/kernel-trace.spec @@ -368,22 +368,22 @@ if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then %_sourcedir/modversions --unpack . < $_ fi -# If the %jobs macro is defined to a number, make will spawn that many jobs. +# The %{_smp_mflags} macro is defined to a number, make will spawn that many jobs. # There are several ways how to define it: # If you are using the build script: # build --jobs=N kernel-$flavor.spec # With plain rpmbuild: # rpmbuild -ba --define 'jobs N' kernel-$flavor.spec # To spawn as many jobs as there are cpu cores: -# rpmbuild -ba --define "jobs 0$(grep -c ^processor /proc/cpuinfo)" \ +# rpmbuild -ba --define "%_smp_mflags -j 0$(grep -Ec 'cpu[0-9]' /proc/stat)" \ # kernel-$flavor.spec # You can also set this permanently in ~/.rpmmacros: -# %jobs 0%(grep -c ^processor /proc/cpuinfo) +# %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat) %if %CONFIG_KMSG_IDS == "y" chmod +x ../linux-%srcversion/scripts/kmsg-doc - make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 + make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 %else - make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y + make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y %endif @@ -880,6 +880,27 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Thu Jun 16 2011 mmarek@suse.cz +- Remove the novfs patches, it should be packaged as a KMP, or + ideally, reimplemented as a fuse filesystem (which is the reason why + the current implementation it is never going to be accepted upstream). +- Delete patches.fixes/novfs-copy_user-fixes.diff. +- Delete patches.fixes/novfs-minsize-fixes. +- Delete patches.fixes/novfs-nwcapi.patch. +- Delete patches.suse/novfs-client-module. +- Delete patches.suse/novfs-remove-bkl. +- commit bc3a79d +* Thu Jun 16 2011 ohering@suse.de +- Update vanilla config files. +- commit a642909 +* Thu Jun 16 2011 ohering@suse.de +- rpm/kernel-binary.spec.in: + jobs is not defined for home: projects, use the new _smp_mflags to enable parallel build +- commit c5eda95 +* Thu Jun 16 2011 ohering@suse.de +- rpm/kernel-binary.spec.in: + Update comment, get the number of cpus from /proc/stat +- commit 83ed0d0 * Wed Jun 15 2011 jeffm@suse.com - Update config files: Disable BRCMSMAC on ppc/ppc64. - commit 20b3d8e diff --git a/kernel-vanilla.changes b/kernel-vanilla.changes index 0cd92d35..dc434e77 100644 --- a/kernel-vanilla.changes +++ b/kernel-vanilla.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Thu Jun 16 12:16:16 CEST 2011 - mmarek@suse.cz + +- Remove the novfs patches, it should be packaged as a KMP, or + ideally, reimplemented as a fuse filesystem (which is the reason why + the current implementation it is never going to be accepted upstream). +- Delete patches.fixes/novfs-copy_user-fixes.diff. +- Delete patches.fixes/novfs-minsize-fixes. +- Delete patches.fixes/novfs-nwcapi.patch. +- Delete patches.suse/novfs-client-module. +- Delete patches.suse/novfs-remove-bkl. +- commit bc3a79d + +------------------------------------------------------------------- +Thu Jun 16 12:04:56 CEST 2011 - ohering@suse.de + +- Update vanilla config files. +- commit a642909 + +------------------------------------------------------------------- +Thu Jun 16 11:50:58 CEST 2011 - ohering@suse.de + +- rpm/kernel-binary.spec.in: + jobs is not defined for home: projects, use the new _smp_mflags to enable parallel build +- commit c5eda95 + +------------------------------------------------------------------- +Thu Jun 16 11:27:44 CEST 2011 - ohering@suse.de + +- rpm/kernel-binary.spec.in: + Update comment, get the number of cpus from /proc/stat +- commit 83ed0d0 + ------------------------------------------------------------------- Wed Jun 15 20:40:28 CEST 2011 - jeffm@suse.com diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index 4e2bfef9..43a0447f 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -364,22 +364,22 @@ if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then %_sourcedir/modversions --unpack . < $_ fi -# If the %jobs macro is defined to a number, make will spawn that many jobs. +# The %{_smp_mflags} macro is defined to a number, make will spawn that many jobs. # There are several ways how to define it: # If you are using the build script: # build --jobs=N kernel-$flavor.spec # With plain rpmbuild: # rpmbuild -ba --define 'jobs N' kernel-$flavor.spec # To spawn as many jobs as there are cpu cores: -# rpmbuild -ba --define "jobs 0$(grep -c ^processor /proc/cpuinfo)" \ +# rpmbuild -ba --define "%_smp_mflags -j 0$(grep -Ec 'cpu[0-9]' /proc/stat)" \ # kernel-$flavor.spec # You can also set this permanently in ~/.rpmmacros: -# %jobs 0%(grep -c ^processor /proc/cpuinfo) +# %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat) %if %CONFIG_KMSG_IDS == "y" chmod +x ../linux-%srcversion/scripts/kmsg-doc - make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 + make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 %else - make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y + make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y %endif @@ -876,6 +876,27 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Thu Jun 16 2011 mmarek@suse.cz +- Remove the novfs patches, it should be packaged as a KMP, or + ideally, reimplemented as a fuse filesystem (which is the reason why + the current implementation it is never going to be accepted upstream). +- Delete patches.fixes/novfs-copy_user-fixes.diff. +- Delete patches.fixes/novfs-minsize-fixes. +- Delete patches.fixes/novfs-nwcapi.patch. +- Delete patches.suse/novfs-client-module. +- Delete patches.suse/novfs-remove-bkl. +- commit bc3a79d +* Thu Jun 16 2011 ohering@suse.de +- Update vanilla config files. +- commit a642909 +* Thu Jun 16 2011 ohering@suse.de +- rpm/kernel-binary.spec.in: + jobs is not defined for home: projects, use the new _smp_mflags to enable parallel build +- commit c5eda95 +* Thu Jun 16 2011 ohering@suse.de +- rpm/kernel-binary.spec.in: + Update comment, get the number of cpus from /proc/stat +- commit 83ed0d0 * Wed Jun 15 2011 jeffm@suse.com - Update config files: Disable BRCMSMAC on ppc/ppc64. - commit 20b3d8e diff --git a/patches.fixes.tar.bz2 b/patches.fixes.tar.bz2 index a2f0dbff..ae6fd6a8 100644 --- a/patches.fixes.tar.bz2 +++ b/patches.fixes.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bc7b43d450c8514852abaea6c804ccd9eb6d3aac95442c35c8eb584a7290e20f -size 39959 +oid sha256:c81abd9508260e6e02f7024b7eb3b241205078c88ea817143fcd2ca5e50a5c6f +size 29111 diff --git a/patches.suse.tar.bz2 b/patches.suse.tar.bz2 index 5a98d5ae..73e50ce0 100644 --- a/patches.suse.tar.bz2 +++ b/patches.suse.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ca2c310ad89a1be8a1c144198e4343a1895e11271f2d50bf041fad89d92f999b -size 194505 +oid sha256:d3af4db21808a221b40a1741252f7c21023a8cc1d96ffceaa87be1ea1791b044 +size 126175 diff --git a/series.conf b/series.conf index 37966615..ea6808d7 100644 --- a/series.conf +++ b/series.conf @@ -291,15 +291,6 @@ # xfs ######################################################## - ######################################################## - # novfs - ######################################################## - patches.suse/novfs-client-module - patches.fixes/novfs-nwcapi.patch - patches.suse/novfs-remove-bkl - patches.fixes/novfs-copy_user-fixes.diff - patches.fixes/novfs-minsize-fixes - ######################################################## # other filesystem stuff: richacls ######################################################## diff --git a/source-timestamp b/source-timestamp index 387ec705..32e17d07 100644 --- a/source-timestamp +++ b/source-timestamp @@ -1,3 +1,3 @@ -2011-06-15 20:41:09 +0200 -GIT Revision: 8049fac838b91daddd0ee1479cc7af6a42add8aa +2011-06-16 12:17:01 +0200 +GIT Revision: bc3a79d83165d5cca2759b0e4d3ec1427d5058fa GIT Branch: master