Home Home > GIT Browse > stable-xen
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.com>2017-08-16 12:50:49 +0200
committerMichal Marek <mmarek@suse.com>2017-08-16 12:50:49 +0200
commitb5f7c1f9ef64ada60aee4267ec9b9070a18979b9 (patch)
tree22aaab37f30f9be1bb9d8583dd51eac584e884ee
parent94b098f7dc682f78e2165d36f383f095045a4ee7 (diff)
parent55832be4e959daaf89fc07d1d3139a75fd364d27 (diff)
Merge branch 'scripts'
Fix for the stop-sync script and other improvements.
-rw-r--r--README15
-rwxr-xr-xscripts/osc_wrapper11
-rwxr-xr-xscripts/stableids2
-rwxr-xr-xscripts/stop-sync2
4 files changed, 27 insertions, 3 deletions
diff --git a/README b/README
index 34a0315287..00cb1062ab 100644
--- a/README
+++ b/README
@@ -175,6 +175,21 @@ test compiled as follows:
$ make oldconfig
$ make
+When committing a patch series try to make the series easy bisectable,
+i.e. when applying only the first x patches (1 <= x <= n, n being the
+number of patches in the series) the kernel is still buildable and
+functional.
+
+This means especially, that just adding upstream patches unmodified
+to a series and doing a cleanup patch at the end of the series to
+ensure the kernel is buildable and functional is to be avoided. Each
+patch from upstream should be modified as required to fit into the
+kernel it is backported to, both for build time and runtime.
+
+In cases where upstream patches did cause a breakage (either build or
+functional) which was corrected by a later patch and both patches are
+part of the series, try to place the correcting patch as near as
+possible to the patch causing breakage.
Config Option Changes
=====================
diff --git a/scripts/osc_wrapper b/scripts/osc_wrapper
index 391210d27c..20aac4969b 100755
--- a/scripts/osc_wrapper
+++ b/scripts/osc_wrapper
@@ -89,7 +89,7 @@ get_branch()
local res version sp
# First, try the local branch name
- res=$(sed -ne 's|^ref: refs/heads/||p' "$topdir/.git/HEAD" 2>/dev/null)
+ res=$(sed -ne 'y|/|:|; s|^ref: refs:heads:||p' "$topdir/.git/HEAD" 2>/dev/null)
if test -n "$res"; then
if project_exists "$kotd_namespace:$res"; then
echo "$res"
@@ -341,6 +341,15 @@ command=
spec=
topdir=$(dirname "$0")/..
+# change 'osc_wrapper --ibs upload' to 'osc_wrapper upload --ibs'
+case "$1" in
+--ibs| --obs)
+ api=$1
+ cmd=$2
+ shift 2
+ set -- "$cmd" "$api" "$@"
+esac
+
case "$1" in
build | upload)
command=$1
diff --git a/scripts/stableids b/scripts/stableids
index 0cef6a5e86..2ae2bebe8b 100755
--- a/scripts/stableids
+++ b/scripts/stableids
@@ -86,7 +86,7 @@ close GIT;
print "Written $idsfile on $machine\n";
-open GIT, "git diff $range|" ||
+open GIT, "git diff --no-renames $range|" ||
die "git diff cannot be run";
open OUT, "|ssh -C $machine 'cat >$patchfile'" ||
die "ssh didn't start";
diff --git a/scripts/stop-sync b/scripts/stop-sync
index 5f091b41c7..fdeeff0ffc 100755
--- a/scripts/stop-sync
+++ b/scripts/stop-sync
@@ -9,7 +9,7 @@ if test -z "$REPLY"; then
exit 1
fi
-(set -x; curl -d "reason=$REPLY" http://kerncvs.nue.suse.com/stop-sync.cgi)
+(set -x; curl -d "reason=$REPLY" http://kerncvs.suse.de/stop-sync.cgi)
res=$?
if test $res -ne 0; then
echo "The curl command failed. Please check your vpn config before panicking."