summaryrefslogtreecommitdiffstats
path: root/meta-selftest
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-11-18 19:59:03 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-11-21 23:08:20 +0000
commit7081beeb18cf332cb4297ae73a2c432bc40f8b5d (patch)
tree4adc6e9fcafd8a766a4ba69501bea1b67d18c1ee /meta-selftest
parent505f7f05a7a66815790182cae48c52d5f72dc100 (diff)
downloadpoky-7081beeb18cf332cb4297ae73a2c432bc40f8b5d.tar.gz
selftest: check that 'devtool upgrade' correctly drops backported patches
There was a regression in this functionality that went unnoticed due to lack of tests. (From OE-Core rev: a75e4eceb703b2b13ddd4ba3dea3a86af0b0a9eb) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-selftest')
-rw-r--r--meta-selftest/recipes-test/devtool/devtool-upgrade-test1-1.5.3/backported.patch37
-rw-r--r--meta-selftest/recipes-test/devtool/devtool-upgrade-test1_1.5.3.bb4
-rw-r--r--meta-selftest/recipes-test/devtool/devtool-upgrade-test1_1.5.3.bb.upgraded4
3 files changed, 43 insertions, 2 deletions
diff --git a/meta-selftest/recipes-test/devtool/devtool-upgrade-test1-1.5.3/backported.patch b/meta-selftest/recipes-test/devtool/devtool-upgrade-test1-1.5.3/backported.patch
new file mode 100644
index 0000000000..c4f3f12666
--- /dev/null
+++ b/meta-selftest/recipes-test/devtool/devtool-upgrade-test1-1.5.3/backported.patch
@@ -0,0 +1,37 @@
1commit ced2ec32b657a7f52604b2e16e5d5881041c517a
2Author: OpenEmbedded <oe.patch@oe>
3Date: Mon Nov 18 18:43:15 2019 +0100
4
5 Backport of the NEWS file from version 1.6.0
6
7diff --git a/doc/NEWS b/doc/NEWS
8index 69793fc..fd49b1c 100644
9--- a/doc/NEWS
10+++ b/doc/NEWS
11@@ -1,3 +1,26 @@
12+1.6.0 - 15 March 2015
13+ - fix lstat64 support when unavailable - separate patches supplied by
14+ Ganael Laplanche and Peter Korsgaard
15+ - (#1506) new option "-D" / "--delay-start" to only show bar after N
16+ seconds (Damon Harper)
17+ - new option "--fineta" / "-I" to show ETA as time of day rather than time
18+ remaining - patch supplied by Erkki Seppälä (r147)
19+ - (#1509) change ETA (--eta / -e) so that days are given if the hours
20+ remaining are 24 or more (Jacek Wielemborek)
21+ - (#1499) repeat read and write attempts on partial buffer fill/empty to
22+ work around post-signal transfer rate drop reported by Ralf Ramsauer
23+ - (#1507) do not try to calculate total size in line mode, due to bug
24+ reported by Jacek Wielemborek and Michiel Van Herwegen
25+ - cleanup: removed defunct RATS comments and unnecessary copyright notices
26+ - clean up displayed lines when using --watchfd PID, when PID exits
27+ - output errors on a new line to avoid overwriting transfer bar
28+
29+1.5.7 - 26 August 2014
30+ - show KiB instead of incorrect kiB (Debian bug #706175)
31+ - (#1284) do not gzip man page, for non-Linux OSes (Bob Friesenhahn)
32+ - work around "awk" bug in tests/016-numeric-timer in decimal "," locales
33+ - fix "make rpm" and "make srpm", extend "make release" to sign releases
34+
35 1.5.3 - 4 May 2014
36 - remove SPLICE_F_NONBLOCK to fix problem with slow splice() (Jan Seda)
37
diff --git a/meta-selftest/recipes-test/devtool/devtool-upgrade-test1_1.5.3.bb b/meta-selftest/recipes-test/devtool/devtool-upgrade-test1_1.5.3.bb
index 333ecac7ed..fee5bee739 100644
--- a/meta-selftest/recipes-test/devtool/devtool-upgrade-test1_1.5.3.bb
+++ b/meta-selftest/recipes-test/devtool/devtool-upgrade-test1_1.5.3.bb
@@ -3,7 +3,9 @@ LICENSE = "Artistic-2.0"
3LIC_FILES_CHKSUM = "file://doc/COPYING;md5=9c50db2589ee3ef10a9b7b2e50ce1d02" 3LIC_FILES_CHKSUM = "file://doc/COPYING;md5=9c50db2589ee3ef10a9b7b2e50ce1d02"
4 4
5SRC_URI = "http://www.ivarch.com/programs/sources/pv-${PV}.tar.gz \ 5SRC_URI = "http://www.ivarch.com/programs/sources/pv-${PV}.tar.gz \
6 file://0001-Add-a-note-line-to-the-quick-reference.patch" 6 file://0001-Add-a-note-line-to-the-quick-reference.patch \
7 file://backported.patch \
8 "
7UPSTREAM_CHECK_URI = "http://www.ivarch.com/programs/pv.shtml" 9UPSTREAM_CHECK_URI = "http://www.ivarch.com/programs/pv.shtml"
8RECIPE_NO_UPDATE_REASON = "This recipe is used to test devtool upgrade feature" 10RECIPE_NO_UPDATE_REASON = "This recipe is used to test devtool upgrade feature"
9 11
diff --git a/meta-selftest/recipes-test/devtool/devtool-upgrade-test1_1.5.3.bb.upgraded b/meta-selftest/recipes-test/devtool/devtool-upgrade-test1_1.5.3.bb.upgraded
index 9d94f671db..66e45c7e84 100644
--- a/meta-selftest/recipes-test/devtool/devtool-upgrade-test1_1.5.3.bb.upgraded
+++ b/meta-selftest/recipes-test/devtool/devtool-upgrade-test1_1.5.3.bb.upgraded
@@ -3,7 +3,9 @@ LICENSE = "Artistic-2.0"
3LIC_FILES_CHKSUM = "file://doc/COPYING;md5=9c50db2589ee3ef10a9b7b2e50ce1d02" 3LIC_FILES_CHKSUM = "file://doc/COPYING;md5=9c50db2589ee3ef10a9b7b2e50ce1d02"
4 4
5SRC_URI = "http://www.ivarch.com/programs/sources/pv-${PV}.tar.gz \ 5SRC_URI = "http://www.ivarch.com/programs/sources/pv-${PV}.tar.gz \
6 file://0001-Add-a-note-line-to-the-quick-reference.patch" 6 file://0001-Add-a-note-line-to-the-quick-reference.patch \
7 file://backported.patch \
8 "
7UPSTREAM_CHECK_URI = "http://www.ivarch.com/programs/pv.shtml" 9UPSTREAM_CHECK_URI = "http://www.ivarch.com/programs/pv.shtml"
8RECIPE_NO_UPDATE_REASON = "This recipe is used to test devtool upgrade feature" 10RECIPE_NO_UPDATE_REASON = "This recipe is used to test devtool upgrade feature"
9 11