From 135858f0b1052cf694734c9adc84618e3a27cd5e Mon Sep 17 00:00:00 2001 From: Patrick Venture Date: Fri, 26 Oct 2018 12:08:58 -0700 Subject: meta-openpower: bsp: skiboot: rename recipes as git Rename the skiboot-based recipes as git and modify the PV for skiboot.inc. (From meta-openpower rev: 464edf2aee03db592fce093ef27b8c2902456e92) Change-Id: Ifec88c2be214e2493836e1c49f99f2ec13cfd954 Signed-off-by: Patrick Venture Signed-off-by: Brad Bishop --- meta-openpower/recipes-bsp/skiboot/gard.bb | 5 ----- meta-openpower/recipes-bsp/skiboot/gard_git.bb | 5 +++++ meta-openpower/recipes-bsp/skiboot/pflash.bb | 8 -------- meta-openpower/recipes-bsp/skiboot/pflash_git.bb | 8 ++++++++ meta-openpower/recipes-bsp/skiboot/skiboot.inc | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 meta-openpower/recipes-bsp/skiboot/gard.bb create mode 100644 meta-openpower/recipes-bsp/skiboot/gard_git.bb delete mode 100644 meta-openpower/recipes-bsp/skiboot/pflash.bb create mode 100644 meta-openpower/recipes-bsp/skiboot/pflash_git.bb (limited to 'meta-openpower/recipes-bsp') diff --git a/meta-openpower/recipes-bsp/skiboot/gard.bb b/meta-openpower/recipes-bsp/skiboot/gard.bb deleted file mode 100644 index 214e905ef..000000000 --- a/meta-openpower/recipes-bsp/skiboot/gard.bb +++ /dev/null @@ -1,5 +0,0 @@ -SUMMARY = "gard record tool for OpenPower" -DESCRIPTION = "gard record tool for OpenPower machines" - -require skiboot.inc -EXTRA_OEMAKE_append = " PFLASH_VERSION=${PV} GARD_VERSION=${PV}" diff --git a/meta-openpower/recipes-bsp/skiboot/gard_git.bb b/meta-openpower/recipes-bsp/skiboot/gard_git.bb new file mode 100644 index 000000000..214e905ef --- /dev/null +++ b/meta-openpower/recipes-bsp/skiboot/gard_git.bb @@ -0,0 +1,5 @@ +SUMMARY = "gard record tool for OpenPower" +DESCRIPTION = "gard record tool for OpenPower machines" + +require skiboot.inc +EXTRA_OEMAKE_append = " PFLASH_VERSION=${PV} GARD_VERSION=${PV}" diff --git a/meta-openpower/recipes-bsp/skiboot/pflash.bb b/meta-openpower/recipes-bsp/skiboot/pflash.bb deleted file mode 100644 index 05aa2fcca..000000000 --- a/meta-openpower/recipes-bsp/skiboot/pflash.bb +++ /dev/null @@ -1,8 +0,0 @@ -SUMMARY = "pflash programmer for OpenPower" -DESCRIPTION = "pflash firmware programming tool for OpenPower machines" - -require skiboot.inc -EXTRA_OEMAKE_append = " PFLASH_VERSION=${PV} LINKAGE=dynamic" - -#TODO: openbmc/openbmc#1361 - Fix GNU_HASH warnings in pflash -TARGET_CC_ARCH += "${LDFLAGS}" diff --git a/meta-openpower/recipes-bsp/skiboot/pflash_git.bb b/meta-openpower/recipes-bsp/skiboot/pflash_git.bb new file mode 100644 index 000000000..05aa2fcca --- /dev/null +++ b/meta-openpower/recipes-bsp/skiboot/pflash_git.bb @@ -0,0 +1,8 @@ +SUMMARY = "pflash programmer for OpenPower" +DESCRIPTION = "pflash firmware programming tool for OpenPower machines" + +require skiboot.inc +EXTRA_OEMAKE_append = " PFLASH_VERSION=${PV} LINKAGE=dynamic" + +#TODO: openbmc/openbmc#1361 - Fix GNU_HASH warnings in pflash +TARGET_CC_ARCH += "${LDFLAGS}" diff --git a/meta-openpower/recipes-bsp/skiboot/skiboot.inc b/meta-openpower/recipes-bsp/skiboot/skiboot.inc index 169b207b7..2fdbba145 100644 --- a/meta-openpower/recipes-bsp/skiboot/skiboot.inc +++ b/meta-openpower/recipes-bsp/skiboot/skiboot.inc @@ -8,7 +8,7 @@ FILESEXTRAPATHS_append := "${THISDIR}/skiboot:" LIC_FILES_CHKSUM = "file://${S}/LICENCE;md5=3b83ef96387f14655fc854ddc3c6bd57" SRCREV = "452998f4be5973d8884e3db5aa362bf40e11467a" -PV = "v6.1" +PV = "6.1+git${SRCPV}" S = "${WORKDIR}/git" -- cgit v1.2.3