Home Home > GIT Browse > packaging
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Suchanek <msuchanek@suse.de>2019-08-07 21:25:15 +0200
committerMichal Suchanek <msuchanek@suse.de>2019-08-07 21:25:15 +0200
commitcda92f9e1dbe5e84e03fe42a07796cb494a22904 (patch)
tree0ce1e1b28b4a1fe4a43c9d8b6d06c616359b19e2
parentaf37821c627bd4dd9285daf581a68be90135374b (diff)
parente1353be651631a960957d82b948f613095816c46 (diff)
Merge branch 'scripts' into packaging
-rw-r--r--scripts/git_sort/README.md2
-rwxr-xr-xscripts/git_sort/git_sort.py3
-rwxr-xr-xscripts/run_oldconfig.sh3
3 files changed, 5 insertions, 3 deletions
diff --git a/scripts/git_sort/README.md b/scripts/git_sort/README.md
index b9881372cd..09b09cf3a7 100644
--- a/scripts/git_sort/README.md
+++ b/scripts/git_sort/README.md
@@ -29,7 +29,7 @@ copy.
Packages are available in the following OBS project
https://build.opensuse.org/package/show/home:benjamin_poirier:series_sort/quilt-ks
Source is avaible from
-https://gitlab.suse.de/benjamin_poirier/quilt
+https://github.com/gobenji/quilt
The packages in home:benjamin_poirier:series_sort are signed with the key
from home:benjamin_poirier which has the following fingerprint:
diff --git a/scripts/git_sort/git_sort.py b/scripts/git_sort/git_sort.py
index 85d9cec0fd..240dc0d83f 100755
--- a/scripts/git_sort/git_sort.py
+++ b/scripts/git_sort/git_sort.py
@@ -218,8 +218,7 @@ remotes = (
Head(RepoURL("mkp/scsi.git"), "5.0/scsi-fixes"),
Head(RepoURL("git://git.kernel.dk/linux-block.git"), "for-next"),
Head(RepoURL("git://git.kernel.org/pub/scm/virt/kvm/kvm.git"), "queue"),
- Head(RepoURL("git://git.infradead.org/nvme.git"), "nvme-4.18"),
- Head(RepoURL("git://git.infradead.org/nvme.git"), "nvme-4.19"),
+ Head(RepoURL("git://git.infradead.org/nvme.git"), "nvme-5.3-rc"),
Head(RepoURL("dhowells/linux-fs.git")),
Head(RepoURL("herbert/cryptodev-2.6.git")),
Head(RepoURL("helgaas/pci.git"), "next"),
diff --git a/scripts/run_oldconfig.sh b/scripts/run_oldconfig.sh
index c3c0651ab8..fb49596553 100755
--- a/scripts/run_oldconfig.sh
+++ b/scripts/run_oldconfig.sh
@@ -455,6 +455,9 @@ for config in $config_files; do
else
config_base="$(dirname "$config")/default"
fi
+ if ! [ -f "$config_base" ] && [ -n "$VARIANT" ] ; then
+ config_base="$(dirname "$config")/${VARIANT#-}"
+ fi
${scripts}/config-merge "$config_base" "$config" >$config_orig
else
cp "$config" $config_orig