From 4020f5d91b3e4d011150d5081d36215f8eab732e Mon Sep 17 00:00:00 2001 From: Leonardo Sandoval Date: Tue, 8 Sep 2015 11:39:09 +0100 Subject: devtool: add upgrade feature Upgrades a recipe to a particular version and downloads the source code into a folder. User can avoid patching the source code. These are the general steps of the upgrade function: - Extract current recipe source code into srctree and create a branch - Extract upgrade recipe source code into srctree and rebase with previous branch. In case the rebase is not correctly applied, source code will not be deleted, so user correct the patches - Creates the new recipe under the workspace [YOCTO #7642] Signed-off-by: Leonardo Sandoval Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- .../recipes-test/devtool/devtool-upgrade_0.1.bb | 25 +++++++++++++++++++ ...-exit-with-EXIT_SUCCESS-instead-of-a-magi.patch | 27 +++++++++++++++++++++ .../devtool/files/devtool-upgrade-0.1.tar.gz | Bin 0 -> 411 bytes .../devtool/files/devtool-upgrade-0.2.tar.gz | Bin 0 -> 411 bytes 4 files changed, 52 insertions(+) create mode 100644 meta-selftest/recipes-test/devtool/devtool-upgrade_0.1.bb create mode 100644 meta-selftest/recipes-test/devtool/files/0001-helloword.c-exit-with-EXIT_SUCCESS-instead-of-a-magi.patch create mode 100644 meta-selftest/recipes-test/devtool/files/devtool-upgrade-0.1.tar.gz create mode 100644 meta-selftest/recipes-test/devtool/files/devtool-upgrade-0.2.tar.gz (limited to 'meta-selftest') diff --git a/meta-selftest/recipes-test/devtool/devtool-upgrade_0.1.bb b/meta-selftest/recipes-test/devtool/devtool-upgrade_0.1.bb new file mode 100644 index 0000000000..33ffc8803a --- /dev/null +++ b/meta-selftest/recipes-test/devtool/devtool-upgrade_0.1.bb @@ -0,0 +1,25 @@ +# +# This file was derived from the 'Hello World!' example recipe in the +# Yocto Project Development Manual. +# + +DESCRIPTION = "Simple helloworld application used to test the devtool upgrade feature" +SECTION = "devtool" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" +PR = "r0" + +SRC_URI = "file://${THISDIR}/files/${P}.tar.gz \ + file://0001-helloword.c-exit-with-EXIT_SUCCESS-instead-of-a-magi.patch \ + " + +S = "${WORKDIR}/${P}" + +do_compile() { + ${CC} helloworld.c -o helloworld +} + +do_install() { + install -d ${D}${bindir} + install -m 0755 helloworld ${D}${bindir} +} diff --git a/meta-selftest/recipes-test/devtool/files/0001-helloword.c-exit-with-EXIT_SUCCESS-instead-of-a-magi.patch b/meta-selftest/recipes-test/devtool/files/0001-helloword.c-exit-with-EXIT_SUCCESS-instead-of-a-magi.patch new file mode 100644 index 0000000000..2294a094b2 --- /dev/null +++ b/meta-selftest/recipes-test/devtool/files/0001-helloword.c-exit-with-EXIT_SUCCESS-instead-of-a-magi.patch @@ -0,0 +1,27 @@ +From 0f37affbc6e6c71687301d99d7259f1968e57c48 Mon Sep 17 00:00:00 2001 +From: Leonardo Sandoval +Date: Wed, 26 Aug 2015 12:42:23 +0000 +Subject: [PATCH] helloword.c: exit with EXIT_SUCCESS instead of a magic number + +--- + helloworld.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/helloworld.c b/helloworld.c +index 71f2e46..54bf50b 100644 +--- a/helloworld.c ++++ b/helloworld.c +@@ -1,8 +1,9 @@ + #include ++#include + + int main(int argc, char **argv) + { + printf("Hello World!\n"); + +- return 0; ++ return EXIT_SUCCESS; + } +-- +1.8.4.5 + diff --git a/meta-selftest/recipes-test/devtool/files/devtool-upgrade-0.1.tar.gz b/meta-selftest/recipes-test/devtool/files/devtool-upgrade-0.1.tar.gz new file mode 100644 index 0000000000..06a1c49cd9 Binary files /dev/null and b/meta-selftest/recipes-test/devtool/files/devtool-upgrade-0.1.tar.gz differ diff --git a/meta-selftest/recipes-test/devtool/files/devtool-upgrade-0.2.tar.gz b/meta-selftest/recipes-test/devtool/files/devtool-upgrade-0.2.tar.gz new file mode 100644 index 0000000000..9b0dcf4b6c Binary files /dev/null and b/meta-selftest/recipes-test/devtool/files/devtool-upgrade-0.2.tar.gz differ -- cgit 1.2.3-korg