Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2009-07-20 11:04:11 -0400
committerJeff Mahoney <jeffm@suse.com>2009-07-20 11:04:11 -0400
commita8c3c64ea9e916f2644e857460eaf0c52160c63d (patch)
treea8066641aed0955d693585ce9d55842c6ced853f
parent2296463c949f73a4d204c6c2cfaca6c8f0638d31 (diff)
parent8767dff5af279b837f0fef870006052d5d424726 (diff)
Merge branch 'master' of kerncvs.suse.de:/home/git/kernel-source
-rw-r--r--kernel-source.changes11
-rw-r--r--rpm/kernel-binary.spec.in33
-rwxr-xr-xrpm/split-modules1
3 files changed, 26 insertions, 19 deletions
diff --git a/kernel-source.changes b/kernel-source.changes
index 0ecce79667..5f4b094d66 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -6,6 +6,11 @@ Mon Jul 20 17:02:57 CEST 2009 - jeffm@suse.com
- Obsoleted patches.fixes/firmware-memmap-64bit.diff
-------------------------------------------------------------------
+Mon Jul 20 13:02:46 CEST 2009 - mmarek@suse.cz
+
+- rpm/split-modules: set LC_COLLATE=C
+
+-------------------------------------------------------------------
Sat Jul 18 03:39:00 CEST 2009 - jeffm@suse.de
- rpm/package-descriptions: Added desktop description.
@@ -20,6 +25,12 @@ Sat Jul 18 01:34:58 CEST 2009 - jeffm@suse.de
- Set HZ=1000
-------------------------------------------------------------------
+Fri Jul 17 11:25:31 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: simplify the add_dirs_to_filelist
+ function and make it less chatty in build logs.
+
+-------------------------------------------------------------------
Fri Jul 17 00:39:39 CEST 2009 - jeffm@suse.com
- patches.apparmor/apparmor.diff: ia64 build fix
diff --git a/rpm/kernel-binary.spec.in b/rpm/kernel-binary.spec.in
index 2ec05853ab..633edfbe3d 100644
--- a/rpm/kernel-binary.spec.in
+++ b/rpm/kernel-binary.spec.in
@@ -609,25 +609,20 @@ if [ %CONFIG_MODULES = y ]; then
fi
add_dirs_to_filelist() {
- local filelist
-
- filelist=$(cat "$@")
- echo "$filelist"
-
- # Below, we do this:
- # - remove filelist macros
- # - remove last pathname component
- # - generate all parents and make the list unique
- # - skip directories owned be other packages
- # - add the %dir prefix (double-escaped for find and rpm)
-
- echo "$filelist" \
- | sed -re 's:%%%%[a-z]+(\([^)]+\))? ?::g' \
- | sed -re 's:/[^/]+$::' \
- | sed -nre ':a; p; s:/[^/]+$::; ta' \
- | sort -u \
- | sed -r -e '\:^(|/boot|/etc|/lib(/modules|/firmware)?|/usr(/src)?)$:d' \
- | sed -e 's:^:%%%%dir :'
+ sed -rn '
+ # print file name
+ p
+ # remove filelist macros
+ s:%%%%[a-z]+(\([^)]+\))? ?::g
+ # add %%%%dir prefix
+ s:^:%%%%dir :
+ # print all parents
+ :a
+ # skip directories owned by other packages
+ s:^%%%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
+ s:/[^/]+$::p
+ ta
+ ' "$@" | sort -u
}
# Collect the file lists.
diff --git a/rpm/split-modules b/rpm/split-modules
index 7751d29344..17b80e01a6 100755
--- a/rpm/split-modules
+++ b/rpm/split-modules
@@ -4,6 +4,7 @@
# of base / supported / unsupported modules
set -e
+export LC_COLLATE=C
usage()
{