diff options
author | Pavel Zhukov <pavel@zhukoff.net> | 2022-03-07 11:30:26 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-22 22:18:51 +0000 |
commit | 02a3d2d460c8172251c783d52b00ca256d23f351 (patch) | |
tree | c521a76e78a08206e677842299eb2344c5cb2ee4 /meta-selftest | |
parent | 677d20b0b8b530ab9196c685b46f32e3d6b3284b (diff) | |
download | poky-02a3d2d460c8172251c783d52b00ca256d23f351.tar.gz |
patch.py: Prevent git repo reinitialization
There were few bugs in the _isInitialized() function which might trigger
git repo to be reinitialized and patches failing to apply.
(From OE-Core rev: 29d86bcad4fc43e09d7499c3f6fba8c499170b9b)
Signed-off-by: Pavel Zhukov <pavel.zhukov@huawei.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-selftest')
-rw-r--r-- | meta-selftest/recipes-test/gitrepotest/gitrepotest.bb | 16 | ||||
-rw-r--r-- | meta-selftest/recipes-test/gitrepotest/gitrepotest/0001-testpatch.patch | 9 |
2 files changed, 25 insertions, 0 deletions
diff --git a/meta-selftest/recipes-test/gitrepotest/gitrepotest.bb b/meta-selftest/recipes-test/gitrepotest/gitrepotest.bb new file mode 100644 index 0000000000..f1b6c55833 --- /dev/null +++ b/meta-selftest/recipes-test/gitrepotest/gitrepotest.bb | |||
@@ -0,0 +1,16 @@ | |||
1 | SUMMARY = "Test recipe for git repo initialization" | ||
2 | HOMEPAGE = "https://git.yoctoproject.org/git/matchbox-panel-2" | ||
3 | LICENSE = "GPL-2.0-or-later" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | ||
5 | |||
6 | INHIBIT_DEFAULT_DEPS = "1" | ||
7 | |||
8 | PATCHTOOL="git" | ||
9 | |||
10 | SRC_URI = "git://git.yoctoproject.org/git/matchbox-panel-2;branch=master;protocol=https \ | ||
11 | file://0001-testpatch.patch \ | ||
12 | " | ||
13 | |||
14 | SRCREV = "f82ca3f42510fb3ef10f598b393eb373a2c34ca7" | ||
15 | |||
16 | S = "${WORKDIR}/git" | ||
diff --git a/meta-selftest/recipes-test/gitrepotest/gitrepotest/0001-testpatch.patch b/meta-selftest/recipes-test/gitrepotest/gitrepotest/0001-testpatch.patch new file mode 100644 index 0000000000..bccda17ee9 --- /dev/null +++ b/meta-selftest/recipes-test/gitrepotest/gitrepotest/0001-testpatch.patch | |||
@@ -0,0 +1,9 @@ | |||
1 | diff --git a/Makefile.am b/Makefile.am | ||
2 | index 432a9b4..bbf7c74 100644 | ||
3 | --- a/Makefile.am | ||
4 | +++ b/Makefile.am | ||
5 | @@ -1,3 +1,4 @@ | ||
6 | +## This is useless comment to test if patch works | ||
7 | ACLOCAL_AMFLAGS = -I m4 | ||
8 | |||
9 | SUBDIRS = matchbox-panel applets data po | ||