From 7cd01cc5a6eb7f2b1c27a7f5383d0d0bc0aea7e0 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Tue, 6 Jul 2010 01:12:13 +0200 Subject: [PATCH] kexec-tools: resplit recipes looking forward 2.0.2. * isolate the old 1.101 patches (and remove it asap...) * 2.0.2 is coming and some patches will be removed. --- .../{files => kexec-tools-1.101}/kexec-arm-atags.patch | 0 .../{files => kexec-tools-1.101}/kexec-tools-arm.patch | 0 .../fix-arm-arch-detection.patch | 0 .../kexec-tools-2-arm-add-uImage.patch | 0 .../kexec-tools-2-autoconf-post-2.63.patch | 0 .../{files => kexec-tools-2.0.1}/no-getline-no-fscanf.patch | 0 .../{files => kexec-tools-dietlibc-2.0.1}/dietlibc.patch | 0 recipes/kexec-tools/kexec-tools-dietlibc_2.0.1.bb | 2 ++ .../kexec-klibc.patch | 0 .../kexec-static.patch | 0 .../kexec-tools-2-headers.patch | 0 .../kexec-tools-2-klibc.patch | 0 recipes/kexec-tools/kexec-tools-klibc-static_1.101.bb | 6 ++++-- recipes/kexec-tools/kexec-tools-klibc-static_2.0.1.bb | 6 ++++-- 14 files changed, 10 insertions(+), 4 deletions(-) rename recipes/kexec-tools/{files => kexec-tools-1.101}/kexec-arm-atags.patch (100%) rename recipes/kexec-tools/{files => kexec-tools-1.101}/kexec-tools-arm.patch (100%) rename recipes/kexec-tools/{files => kexec-tools-2.0.1}/fix-arm-arch-detection.patch (100%) rename recipes/kexec-tools/{files => kexec-tools-2.0.1}/kexec-tools-2-arm-add-uImage.patch (100%) rename recipes/kexec-tools/{files => kexec-tools-2.0.1}/kexec-tools-2-autoconf-post-2.63.patch (100%) rename recipes/kexec-tools/{files => kexec-tools-2.0.1}/no-getline-no-fscanf.patch (100%) rename recipes/kexec-tools/{files => kexec-tools-dietlibc-2.0.1}/dietlibc.patch (100%) rename recipes/kexec-tools/{files => kexec-tools-klibc-static-1.101}/kexec-klibc.patch (100%) rename recipes/kexec-tools/{files => kexec-tools-klibc-static-1.101}/kexec-static.patch (100%) rename recipes/kexec-tools/{files => kexec-tools-klibc-static-2.0.1}/kexec-tools-2-headers.patch (100%) rename recipes/kexec-tools/{files => kexec-tools-klibc-static-2.0.1}/kexec-tools-2-klibc.patch (100%) diff --git a/recipes/kexec-tools/files/kexec-arm-atags.patch b/recipes/kexec-tools/kexec-tools-1.101/kexec-arm-atags.patch similarity index 100% rename from recipes/kexec-tools/files/kexec-arm-atags.patch rename to recipes/kexec-tools/kexec-tools-1.101/kexec-arm-atags.patch diff --git a/recipes/kexec-tools/files/kexec-tools-arm.patch b/recipes/kexec-tools/kexec-tools-1.101/kexec-tools-arm.patch similarity index 100% rename from recipes/kexec-tools/files/kexec-tools-arm.patch rename to recipes/kexec-tools/kexec-tools-1.101/kexec-tools-arm.patch diff --git a/recipes/kexec-tools/files/fix-arm-arch-detection.patch b/recipes/kexec-tools/kexec-tools-2.0.1/fix-arm-arch-detection.patch similarity index 100% rename from recipes/kexec-tools/files/fix-arm-arch-detection.patch rename to recipes/kexec-tools/kexec-tools-2.0.1/fix-arm-arch-detection.patch diff --git a/recipes/kexec-tools/files/kexec-tools-2-arm-add-uImage.patch b/recipes/kexec-tools/kexec-tools-2.0.1/kexec-tools-2-arm-add-uImage.patch similarity index 100% rename from recipes/kexec-tools/files/kexec-tools-2-arm-add-uImage.patch rename to recipes/kexec-tools/kexec-tools-2.0.1/kexec-tools-2-arm-add-uImage.patch diff --git a/recipes/kexec-tools/files/kexec-tools-2-autoconf-post-2.63.patch b/recipes/kexec-tools/kexec-tools-2.0.1/kexec-tools-2-autoconf-post-2.63.patch similarity index 100% rename from recipes/kexec-tools/files/kexec-tools-2-autoconf-post-2.63.patch rename to recipes/kexec-tools/kexec-tools-2.0.1/kexec-tools-2-autoconf-post-2.63.patch diff --git a/recipes/kexec-tools/files/no-getline-no-fscanf.patch b/recipes/kexec-tools/kexec-tools-2.0.1/no-getline-no-fscanf.patch similarity index 100% rename from recipes/kexec-tools/files/no-getline-no-fscanf.patch rename to recipes/kexec-tools/kexec-tools-2.0.1/no-getline-no-fscanf.patch diff --git a/recipes/kexec-tools/files/dietlibc.patch b/recipes/kexec-tools/kexec-tools-dietlibc-2.0.1/dietlibc.patch similarity index 100% rename from recipes/kexec-tools/files/dietlibc.patch rename to recipes/kexec-tools/kexec-tools-dietlibc-2.0.1/dietlibc.patch diff --git a/recipes/kexec-tools/kexec-tools-dietlibc_2.0.1.bb b/recipes/kexec-tools/kexec-tools-dietlibc_2.0.1.bb index ab9cb51d55..de5c0c1522 100644 --- a/recipes/kexec-tools/kexec-tools-dietlibc_2.0.1.bb +++ b/recipes/kexec-tools/kexec-tools-dietlibc_2.0.1.bb @@ -1,6 +1,8 @@ # the binaries are statical linked against dietlibc require kexec-tools2.inc +FILESPATHPKG =. "kexec-tools-${PV}:" + SRC_URI += "file://dietlibc.patch" inherit dietlibc diff --git a/recipes/kexec-tools/files/kexec-klibc.patch b/recipes/kexec-tools/kexec-tools-klibc-static-1.101/kexec-klibc.patch similarity index 100% rename from recipes/kexec-tools/files/kexec-klibc.patch rename to recipes/kexec-tools/kexec-tools-klibc-static-1.101/kexec-klibc.patch diff --git a/recipes/kexec-tools/files/kexec-static.patch b/recipes/kexec-tools/kexec-tools-klibc-static-1.101/kexec-static.patch similarity index 100% rename from recipes/kexec-tools/files/kexec-static.patch rename to recipes/kexec-tools/kexec-tools-klibc-static-1.101/kexec-static.patch diff --git a/recipes/kexec-tools/files/kexec-tools-2-headers.patch b/recipes/kexec-tools/kexec-tools-klibc-static-2.0.1/kexec-tools-2-headers.patch similarity index 100% rename from recipes/kexec-tools/files/kexec-tools-2-headers.patch rename to recipes/kexec-tools/kexec-tools-klibc-static-2.0.1/kexec-tools-2-headers.patch diff --git a/recipes/kexec-tools/files/kexec-tools-2-klibc.patch b/recipes/kexec-tools/kexec-tools-klibc-static-2.0.1/kexec-tools-2-klibc.patch similarity index 100% rename from recipes/kexec-tools/files/kexec-tools-2-klibc.patch rename to recipes/kexec-tools/kexec-tools-klibc-static-2.0.1/kexec-tools-2-klibc.patch diff --git a/recipes/kexec-tools/kexec-tools-klibc-static_1.101.bb b/recipes/kexec-tools/kexec-tools-klibc-static_1.101.bb index 65fb02165c..6c672010f9 100644 --- a/recipes/kexec-tools/kexec-tools-klibc-static_1.101.bb +++ b/recipes/kexec-tools/kexec-tools-klibc-static_1.101.bb @@ -4,9 +4,11 @@ require kexec-tools.inc PR = "r8" DEPENDS = "klibc" +FILESPATHPKG =. "kexec-tools-${PV}:" + SRC_URI += "file://kexec-static.patch \ - file://kexec-klibc.patch \ - " + file://kexec-klibc.patch \ + " S = "${WORKDIR}/kexec-tools-${PV}" EXTRA_OECONF = " --without-zlib" diff --git a/recipes/kexec-tools/kexec-tools-klibc-static_2.0.1.bb b/recipes/kexec-tools/kexec-tools-klibc-static_2.0.1.bb index bbd1753af0..b092d60824 100644 --- a/recipes/kexec-tools/kexec-tools-klibc-static_2.0.1.bb +++ b/recipes/kexec-tools/kexec-tools-klibc-static_2.0.1.bb @@ -6,9 +6,11 @@ DEFAULT_PREFERENCE = "1" PR = "r4" DEPENDS = "klibc" +FILESPATHPKG =. "kexec-tools-${PV}:" + SRC_URI += "file://kexec-tools-2-headers.patch \ - file://kexec-tools-2-klibc.patch \ - " + file://kexec-tools-2-klibc.patch \ + " S = "${WORKDIR}/kexec-tools-${PV}" -- 2.39.5