Home Home > GIT Browse > packaging
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Suchanek <msuchanek@suse.de>2018-11-05 11:27:25 +0100
committerMichal Suchanek <msuchanek@suse.de>2018-11-05 11:27:25 +0100
commit4d9c3fb599ce8a4072aea58b2cb019d89c482cd6 (patch)
tree9ff8136e48242a2bc53baa9f524607dcd941796b
parent57326f55bba195babadcc256de72a0adafc2551d (diff)
parentae17800d6e04f53675708dcf59a7ac2651526375 (diff)
Merge branch 'users/mkubecek/packaging/for-next' of kerncvs.suse.de:/srv/git/kernel-source into packaging
-rw-r--r--rpm/kernel-binary.spec.in8
-rwxr-xr-xrpm/try-disable-staging-driver8
-rwxr-xr-xscripts/git_sort/git_sort.py3
-rw-r--r--scripts/patch-tag-template2
-rwxr-xr-xscripts/run_oldconfig.sh8
-rwxr-xr-xscripts/sequence-patch.sh9
-rwxr-xr-xscripts/series2git2
-rwxr-xr-xscripts/tar-up.sh6
8 files changed, 36 insertions, 10 deletions
diff --git a/rpm/kernel-binary.spec.in b/rpm/kernel-binary.spec.in
index 7fd6195ed9..4f445e5009 100644
--- a/rpm/kernel-binary.spec.in
+++ b/rpm/kernel-binary.spec.in
@@ -393,7 +393,13 @@ if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
yes '' | make oldconfig $MAKE_ARGS $KERN_DIRS
else
cp .config .config.orig
- make silentoldconfig $MAKE_ARGS $KERN_DIRS < /dev/null
+ if test -f ../scripts/kconfig/Makefile && \
+ grep -q syncconfig ../scripts/kconfig/Makefile; then
+ syncconfig="syncconfig"
+ else
+ syncconfig="silentoldconfig"
+ fi
+ make $syncconfig $MAKE_ARGS $KERN_DIRS < /dev/null
%_sourcedir/check-for-config-changes .config.orig .config
rm .config.orig
fi
diff --git a/rpm/try-disable-staging-driver b/rpm/try-disable-staging-driver
index dee6738b35..5996ca969c 100755
--- a/rpm/try-disable-staging-driver
+++ b/rpm/try-disable-staging-driver
@@ -30,6 +30,12 @@ if test -L source; then
else
source="."
fi
+if test -f ${source}/scripts/kconfig/Makefile && \
+ grep -q syncconfig ${source}/scripts/kconfig/Makefile; then
+ syncconfig="syncconfig"
+else
+ syncconfig="silentoldconfig"
+fi
makefile="$source/drivers/staging/Makefile"
skipped_options=staging-skipped-options
logfile=$1
@@ -70,7 +76,7 @@ fi
echo "Trying to disable $option"
"$source/scripts/config" --disable "$option"
-if ! make silentoldconfig $MAKE_ARGS || grep "^$option" .config; then
+if ! make $syncconfig $MAKE_ARGS || grep "^$option" .config; then
echo "Could not disable $option" >&2
exit 1
fi
diff --git a/scripts/git_sort/git_sort.py b/scripts/git_sort/git_sort.py
index e832e906a6..349a9fb20b 100755
--- a/scripts/git_sort/git_sort.py
+++ b/scripts/git_sort/git_sort.py
@@ -188,6 +188,7 @@ remotes = (
Head(RepoURL("tj/libata.git"), "for-next"),
Head(RepoURL("https://github.com/kdave/btrfs-devel.git"), "misc-next"),
Head(RepoURL("git://people.freedesktop.org/~airlied/linux"), "drm-next"),
+ Head(RepoURL("git://anongit.freedesktop.org/drm/drm-misc"), "drm-misc-next"),
Head(RepoURL("gregkh/tty.git"), "tty-next"),
Head(RepoURL("jj/linux-apparmor.git"), "apparmor-next"),
Head(RepoURL("pablo/nf.git")),
@@ -441,7 +442,7 @@ class Cache(object):
# This detailed check may be needed if an older git-sort (which
# didn't set a cache version) modified the cache.
if (not isinstance(cache_history, list) or
- len(cache_history) < 1 or
+ len(cache_history) < 1 or
len(cache_history[0]) != 4 or
not isinstance(cache_history[0][3], dict)):
raise CInconsistent
diff --git a/scripts/patch-tag-template b/scripts/patch-tag-template
index 4d6650ca9e..353552327e 100644
--- a/scripts/patch-tag-template
+++ b/scripts/patch-tag-template
@@ -38,7 +38,7 @@ Acked-by:
# examples:
# Patch-mainline: never. fixes bugs in SUSE specific code
# Patch-mainline: submitted 2004-11-01
-# Patch-mainline: 2.6.10-rc1 any free form text is valid after the version
+# Patch-mainline: v2.6.10-rc1 any free form text is valid after the version
#
Patch-mainline:
diff --git a/scripts/run_oldconfig.sh b/scripts/run_oldconfig.sh
index fadac621ee..123ab38243 100755
--- a/scripts/run_oldconfig.sh
+++ b/scripts/run_oldconfig.sh
@@ -24,6 +24,12 @@
# dirty scroll region tricks ...
use_region=false
+if test -f scripts/kconfig/Makefile && \
+ grep -q syncconfig scripts/kconfig/Makefile; then
+ syncconfig="syncconfig"
+else
+ syncconfig="silentoldconfig"
+fi
function _region_init_ () {
echo -ne '\x1b[H\033[J' # clear screen
@@ -456,7 +462,7 @@ for config in $config_files; do
*)
_region_msg_ "working on $config"
if $check; then
- if ! make $MAKE_ARGS silentoldconfig </dev/null; then
+ if ! make $MAKE_ARGS $syncconfig </dev/null; then
echo "${config#$prefix} is out of date"
err=1
rm $config_orig
diff --git a/scripts/sequence-patch.sh b/scripts/sequence-patch.sh
index 2447abd8dc..75fa028ba6 100755
--- a/scripts/sequence-patch.sh
+++ b/scripts/sequence-patch.sh
@@ -394,6 +394,7 @@ export TMPDIR
ORIG_DIR=$SCRATCH_AREA/linux-$SRCVERSION.orig
TAG=$(get_branch_name)
TAG=${TAG//\//_}
+TAG=${TAG//\#/_}
if $VANILLA; then
TAG=${TAG}-vanilla
fi
@@ -666,8 +667,14 @@ if test -n "$CONFIG"; then
echo "[ No kABI references for $CONFIG ]"
fi
fi
+ if test -f ${PATCH_DIR}/scripts/kconfig/Makefile && \
+ grep -q syncconfig ${PATCH_DIR}/scripts/kconfig/Makefile; then
+ syncconfig="syncconfig"
+ else
+ syncconfig="silentoldconfig"
+ fi
test "$SP_BUILD_DIR" != "$PATCH_DIR" && \
- make -C $PATCH_DIR O=$SP_BUILD_DIR -s silentoldconfig
+ make -C $PATCH_DIR O=$SP_BUILD_DIR -s $syncconfig
fi
# Some archs we use for the config do not exist or have a different name in the
diff --git a/scripts/series2git b/scripts/series2git
index defcb51574..e62ccc7e02 100755
--- a/scripts/series2git
+++ b/scripts/series2git
@@ -200,7 +200,7 @@ apply_patch()
GIT_AUTHOR_EMAIL=
;;
esac
- local subject=$(ex_hdr Subject "$patch")
+ local subject=$(ex_hdr Subject "$patch" | sed -es'/\[[^]]*\] //')
GIT_AUTHOR_DATE=$(ex_hdr Date "$patch")
GIT_AUTHOR_DATE=$(ex_hdr Date "$patch" \
| perl -p -e 's/(\d\d:\d\d:\d\d) (\d{4})/$2 $1/;s/:$//')
diff --git a/scripts/tar-up.sh b/scripts/tar-up.sh
index b933faab7d..90c3f3ab0a 100755
--- a/scripts/tar-up.sh
+++ b/scripts/tar-up.sh
@@ -198,7 +198,7 @@ CLEANFILES=("${CLEANFILES[@]}" "$tmpdir")
cp -p rpm/* config.conf supported.conf doc/* $build_dir
match="${flavor:+\\/$flavor$}"
-match="${arch:+^+${arch}${match:+.*}}${match}"
+match="${arch:+^+\\($(echo -n "${arch}" | sed 's/[, ]\+/\\\|/g')\\)\\>${match:+.*}}${match}"
[ -n "$match" ] && sed -i "/^$\|\s*#\|${match}/b; s/\(.*\)/#### \1/" $build_dir/config.conf
if test -e misc/extract-modaliases; then
cp misc/extract-modaliases $build_dir
@@ -207,7 +207,7 @@ fi
if grep -q '^Source.*:[[:space:]]*log\.sh[[:space:]]*$' rpm/kernel-source.spec.in; then
cp -p scripts/rpm-log.sh "$build_dir"/log.sh
fi
-rm -f "$build_dir/kernel-source.changes.old" "$build_dir/gitlog-fixups"
+rm -f "$build_dir/kernel-source.changes.old" "$build_dir/gitlog-fixups" "$build_dir/gitlog-excludes"
if test -e "$build_dir"/config-options.changes; then
# Rename to avoid triggering a build service rule error
mv "$build_dir"/config-options.changes \
@@ -243,7 +243,7 @@ elif $using_git; then
echo "expected \"last commit: <commit>\" in rpm/kernel-source.changes.old" >&2
exit 1
esac
- if test -d rpm/gitlog-excludes; then
+ if test -e rpm/gitlog-excludes; then
exclude=(--excludes "$_" "${exclude[@]}")
fi
if test -e rpm/gitlog-fixups; then