Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2009-07-27 17:06:32 +0200
committerMichal Marek <mmarek@suse.cz>2009-07-27 17:06:32 +0200
commit8b58046c979bba9c7e7c59915d0593a4e571bbd8 (patch)
tree5050913ed1d4e3f6ea0964e18615909a364418b2
parentbf8ddbe6a6e7cc27e7f27b6f132de4dac6653e42 (diff)
- rpm/kernel-source.spec.in, scripts/tar-up.sh: really drop
config-subst from the package.
-rw-r--r--kernel-source.changes6
-rw-r--r--rpm/kernel-source.spec.in2
-rwxr-xr-xscripts/tar-up.sh2
3 files changed, 9 insertions, 1 deletions
diff --git a/kernel-source.changes b/kernel-source.changes
index 74a29b3e5e..94f123096c 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Mon Jul 27 17:06:11 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-source.spec.in, scripts/tar-up.sh: really drop
+ config-subst from the package.
+
+-------------------------------------------------------------------
Mon Jul 27 13:43:01 CEST 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: manually create a -devel-debuginfo
diff --git a/rpm/kernel-source.spec.in b/rpm/kernel-source.spec.in
index 8a7a26c82f..9911716f43 100644
--- a/rpm/kernel-source.spec.in
+++ b/rpm/kernel-source.spec.in
@@ -101,7 +101,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
Prefix: /usr/src
-%(chmod +x %_sourcedir/{guards,config-subst,check-for-config-changes,symsets.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols})
+%(chmod +x %_sourcedir/{guards,check-for-config-changes,symsets.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols})
%define symbols %(set -- $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
%define variant_symbols %(case %name in (*-rt) echo "RT" ;; esac)
diff --git a/scripts/tar-up.sh b/scripts/tar-up.sh
index 790359dbd7..b798e2490b 100755
--- a/scripts/tar-up.sh
+++ b/scripts/tar-up.sh
@@ -129,6 +129,8 @@ CLEANFILES=("${CLEANFILES[@]}" "$tmpdir")
cp -p rpm/* config.conf supported.conf doc/README.{SUSE,KSYMS} \
misc/extract-modaliases $build_dir
+# FIXME: move config-subst out of rpm/
+rm "$build_dir/config-subst"
cat kernel-source.changes{,.old} > "$build_dir/kernel-source$VARIANT.changes"