Home| summaryrefslogtreecommitdiff |
diff options
| author | Kernel Build Daemon <kbuild@suse.de> | 2019-01-15 12:01:59 +0100 |
|---|---|---|
| committer | Kernel Build Daemon <kbuild@suse.de> | 2019-01-15 12:01:59 +0100 |
| commit | f2025b51b6dfad0435849b353b1fa3353f58338f (patch) | |
| tree | 124a942b291eab5cf26cb6c07d5ea9c29d6dc2e0 | |
| parent | e2de14d7745158a7d7392238c9098874a2ff45cd (diff) | |
| parent | aff5480deee35a6081956e53b3315c1c996e5300 (diff) | |
Merge branch 'scripts' into linux-next
| -rwxr-xr-x | scripts/tar-up.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/tar-up.sh b/scripts/tar-up.sh index 90c3f3ab0a..c50e4da377 100755 --- a/scripts/tar-up.sh +++ b/scripts/tar-up.sh @@ -195,8 +195,9 @@ CLEANFILES=() trap 'if test -n "$CLEANFILES"; then rm -rf "${CLEANFILES[@]}"; fi' EXIT tmpdir=$(mktemp -dt ${0##*/}.XXXXXX) CLEANFILES=("${CLEANFILES[@]}" "$tmpdir") +rpmfiles=$(echo rpm/* | grep -v "~$") -cp -p rpm/* config.conf supported.conf doc/* $build_dir +cp -p $rpmfiles config.conf supported.conf doc/* $build_dir match="${flavor:+\\/$flavor$}" match="${arch:+^+\\($(echo -n "${arch}" | sed 's/[, ]\+/\\\|/g')\\)\\>${match:+.*}}${match}" [ -n "$match" ] && sed -i "/^$\|\s*#\|${match}/b; s/\(.*\)/#### \1/" $build_dir/config.conf |