--- doc/README.SUSE | 4 ++-- kernel-source.changes | 5 +++++ rpm/compute-PATCHVERSION.sh | 2 +- rpm/kernel-binary.spec.in | 6 +++--- rpm/kernel-source.spec.in | 2 +- scripts/tar-up.sh | 2 +- 6 files changed, 13 insertions(+), 8 deletions(-) diff --git a/doc/README.SUSE b/doc/README.SUSE index bb63204..b49e335 100644 --- a/doc/README.SUSE +++ b/doc/README.SUSE @@ -302,9 +302,9 @@ can be generated from vanilla sources + patches like this: $ cd /usr/src/packages/SOURCES $ for f in patches.*.tar.bz2; do \ - tar xfj $f || break; \ + tar -xjf "$f" || break; \ done - $ tar xfj linux-2.6.5.tar.bz2 + $ tar -xjf linux-2.6.5.tar.bz2 # Apply the patches diff --git a/kernel-source.changes b/kernel-source.changes index 92c2fad..4697333 100644 --- a/kernel-source.changes +++ b/kernel-source.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Feb 5 07:47:40 UTC 2010 - jengelh@medozas.de + +- use standard short options in tar commands + +------------------------------------------------------------------- Thu Feb 4 13:23:57 CET 2010 - knikanth@suse.de - patches.fixes/dm-stripe-zero-stripes: dm-stripe: return -EINVAL diff --git a/rpm/compute-PATCHVERSION.sh b/rpm/compute-PATCHVERSION.sh index fb9a1a5..27becf6 100755 --- a/rpm/compute-PATCHVERSION.sh +++ b/rpm/compute-PATCHVERSION.sh @@ -49,7 +49,7 @@ while read patch; do warned=true fi tmp_files="$tmp_files $dir" - tar xjf "$p/$dir.tar.bz2" + tar -xjf "$p/$dir.tar.bz2" echo "$patch" continue 2 fi diff --git a/rpm/kernel-binary.spec.in b/rpm/kernel-binary.spec.in index 78daad3..93d61dd 100644 --- a/rpm/kernel-binary.spec.in +++ b/rpm/kernel-binary.spec.in @@ -43,7 +43,7 @@ # Define some CONFIG variables as rpm macros as well. (rpm cannot handle # defining them all at once.) %define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT -%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} +%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %define split_base (%CONFIG_SPLIT_PACKAGE == "y") %define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y") @@ -585,8 +585,8 @@ if [ %CONFIG_MODULES = y ]; then fi fi - tar cf - -T %my_builddir/obj-files | \ - tar xf - -C %rpm_install_dir/%cpu_arch_flavor + tar -cf - -T %my_builddir/obj-files | \ + tar -xf - -C %rpm_install_dir/%cpu_arch_flavor # bnc#507084 find %rpm_install_dir/%cpu_arch_flavor/scripts -type f -perm -111 | \ while read f; do diff --git a/rpm/kernel-source.spec.in b/rpm/kernel-source.spec.in index bd681ad..c1067ef 100644 --- a/rpm/kernel-source.spec.in +++ b/rpm/kernel-source.spec.in @@ -150,7 +150,7 @@ cd $RPM_BUILD_ROOT/usr/src ln -sf linux%variant linux%variant # dummy symlink # Unpack the vanilla kernel sources -tar xjf %_sourcedir/linux-%srcversion.tar.bz2 +tar -xjf %_sourcedir/linux-%srcversion.tar.bz2 mv linux-%srcversion linux-%kernelrelease%variant diff --git a/scripts/tar-up.sh b/scripts/tar-up.sh index f3bf649..296a07c 100755 --- a/scripts/tar-up.sh +++ b/scripts/tar-up.sh @@ -222,7 +222,7 @@ stable_tar() { cd "$chdir" find "$@" \( -type f -o -type l -o -type d -a -empty \) -print0 | \ LC_ALL=C sort -z | \ - tar cf - --null -T - "${tar_opts[@]}" + tar -cf - --null -T - "${tar_opts[@]}" ) | bzip2 -9 >"$tarball" } -- 1.6.6.1 -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-kernel+help@opensuse.org