From: Denys Dmytriyenko <denis@denix.org>
To: Marek Vasut <marex@denx.de>
Cc: openembedded-core@lists.openembedded.org
Subject: Re: [PATCH 1/5] u-boot: Factor out common bits
Date: Wed, 19 Oct 2016 16:13:49 -0400 [thread overview]
Message-ID: <20161019201349.GS2494@denix.org> (raw)
In-Reply-To: <20161018215513.2873-1-marex@denx.de>
On Tue, Oct 18, 2016 at 11:55:09PM +0200, Marek Vasut wrote:
> The u-boot recipes share a couple of common variables, which makes
> updating of the recipes error prone and a toil. Factor those common
> bits into u-boot-common_${PV}.inc so that they are in one place.
>
> The u-boot_${PV}.bb now explicitly require u-boot-common_${PV}.inc
> before require u-boot.inc , as doing require u-boot-common_${PV}.inc
> from u-boot.inc would fail due to ${PV} not being set. This is a
> functional change.
Any issues making .inc file version-agnostic and moving SRCREV out to .bb?
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
> Cc: Denys Dmytriyenko <denis@denix.org>
> ---
> meta/recipes-bsp/u-boot/u-boot-common_2016.03.inc | 16 ++++++++++++++++
> meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.03.bb | 16 ++--------------
> meta/recipes-bsp/u-boot/u-boot-mkimage_2016.03.bb | 17 ++---------------
> meta/recipes-bsp/u-boot/u-boot.inc | 8 --------
> meta/recipes-bsp/u-boot/u-boot_2016.03.bb | 8 +-------
> 5 files changed, 21 insertions(+), 44 deletions(-)
> create mode 100644 meta/recipes-bsp/u-boot/u-boot-common_2016.03.inc
>
> diff --git a/meta/recipes-bsp/u-boot/u-boot-common_2016.03.inc b/meta/recipes-bsp/u-boot/u-boot-common_2016.03.inc
> new file mode 100644
> index 0000000..403e316
> --- /dev/null
> +++ b/meta/recipes-bsp/u-boot/u-boot-common_2016.03.inc
> @@ -0,0 +1,16 @@
> +HOMEPAGE = "http://www.denx.de/wiki/U-Boot/WebHome"
> +SECTION = "bootloaders"
> +
> +LICENSE = "GPLv2+"
> +LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
> +
> +# This revision corresponds to the tag "v2016.03"
> +# We use the revision in order to avoid having to fetch it from the
> +# repo during parse
> +SRCREV = "df61a74e6845ec9bdcdd48d2aff5e9c2c6debeaa"
> +
> +PV = "v2016.03+git${SRCPV}"
> +
> +SRC_URI = "git://git.denx.de/u-boot.git;branch=master"
> +
> +S = "${WORKDIR}/git"
> diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.03.bb b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.03.bb
> index 79f1548..f56862c 100644
> --- a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.03.bb
> +++ b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.03.bb
> @@ -1,20 +1,8 @@
> +require u-boot-common_${PV}.inc
> +
> SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities"
> -LICENSE = "GPLv2+"
> -LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
> -SECTION = "bootloader"
> DEPENDS = "mtd-utils"
>
> -# This revision corresponds to the tag "v2016.03"
> -# We use the revision in order to avoid having to fetch it from the
> -# repo during parse
> -SRCREV = "df61a74e6845ec9bdcdd48d2aff5e9c2c6debeaa"
> -
> -PV = "v2016.03+git${SRCPV}"
> -
> -SRC_URI = "git://git.denx.de/u-boot.git;branch=master"
> -
> -S = "${WORKDIR}/git"
> -
> INSANE_SKIP_${PN} = "already-stripped"
> EXTRA_OEMAKE_class-target = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${CC} ${CFLAGS} ${LDFLAGS}" V=1'
> EXTRA_OEMAKE_class-cross = 'ARCH=${TARGET_ARCH} CC="${CC} ${CFLAGS} ${LDFLAGS}" V=1'
> diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage_2016.03.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2016.03.bb
> index d5921a0..5025961 100644
> --- a/meta/recipes-bsp/u-boot/u-boot-mkimage_2016.03.bb
> +++ b/meta/recipes-bsp/u-boot/u-boot-mkimage_2016.03.bb
> @@ -1,21 +1,8 @@
> -SUMMARY = "U-Boot bootloader image creation tool"
> -LICENSE = "GPLv2+"
> -LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
> -SECTION = "bootloader"
> +require u-boot-common_${PV}.inc
>
> +SUMMARY = "U-Boot bootloader image creation tool"
> DEPENDS = "openssl"
>
> -# This revision corresponds to the tag "v2016.03"
> -# We use the revision in order to avoid having to fetch it from the
> -# repo during parse
> -SRCREV = "df61a74e6845ec9bdcdd48d2aff5e9c2c6debeaa"
> -
> -PV = "v2016.03+git${SRCPV}"
> -
> -SRC_URI = "git://git.denx.de/u-boot.git;branch=master"
> -
> -S = "${WORKDIR}/git"
> -
> EXTRA_OEMAKE = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" STRIP=true V=1'
>
> do_compile () {
> diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
> index 252aae9..afe3fe9 100644
> --- a/meta/recipes-bsp/u-boot/u-boot.inc
> +++ b/meta/recipes-bsp/u-boot/u-boot.inc
> @@ -1,14 +1,6 @@
> SUMMARY = "Universal Boot Loader for embedded devices"
> -HOMEPAGE = "http://www.denx.de/wiki/U-Boot/WebHome"
> -SECTION = "bootloaders"
> PROVIDES = "virtual/bootloader"
>
> -LICENSE = "GPLv2+"
> -LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
> -
> -SRC_URI = "git://git.denx.de/u-boot.git;branch=master"
> -
> -S = "${WORKDIR}/git"
> B = "${WORKDIR}/build"
>
> PACKAGE_ARCH = "${MACHINE_ARCH}"
> diff --git a/meta/recipes-bsp/u-boot/u-boot_2016.03.bb b/meta/recipes-bsp/u-boot/u-boot_2016.03.bb
> index 836b0ce..dabe709 100644
> --- a/meta/recipes-bsp/u-boot/u-boot_2016.03.bb
> +++ b/meta/recipes-bsp/u-boot/u-boot_2016.03.bb
> @@ -1,10 +1,4 @@
> +require u-boot-common_${PV}.inc
> require u-boot.inc
>
> DEPENDS += "dtc-native"
> -
> -# This revision corresponds to the tag "v2016.03"
> -# We use the revision in order to avoid having to fetch it from the
> -# repo during parse
> -SRCREV = "df61a74e6845ec9bdcdd48d2aff5e9c2c6debeaa"
> -
> -PV = "v2016.03+git${SRCPV}"
> --
> 2.9.3
>
next prev parent reply other threads:[~2016-10-19 20:13 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-18 21:55 [PATCH 1/5] u-boot: Factor out common bits Marek Vasut
2016-10-18 21:55 ` [PATCH 2/5] u-boot: Update to 2016.09.01 release Marek Vasut
2016-10-19 12:06 ` Alexander Kanavin
2016-10-19 20:10 ` Denys Dmytriyenko
2016-10-18 21:55 ` [PATCH 3/5] u-boot: Drop the +git part from PV Marek Vasut
2016-10-19 20:15 ` Denys Dmytriyenko
2016-10-18 21:55 ` [PATCH 4/5] u-boot: Drop PV altogether Marek Vasut
2016-10-19 12:09 ` Alexander Kanavin
2016-10-19 20:27 ` Denys Dmytriyenko
2016-10-19 20:10 ` Denys Dmytriyenko
2016-10-19 21:00 ` Marek Vasut
2016-10-19 21:15 ` Denys Dmytriyenko
2016-10-19 21:39 ` Burton, Ross
2016-10-19 22:53 ` Marek Vasut
2016-10-20 10:13 ` Burton, Ross
2016-10-20 13:36 ` Marek Vasut
2016-10-18 21:55 ` [PATCH 5/5] u-boot: Drop redundant comment Marek Vasut
2016-10-19 20:11 ` Denys Dmytriyenko
2016-10-19 20:13 ` Denys Dmytriyenko [this message]
2016-10-19 20:39 ` [PATCH 1/5] u-boot: Factor out common bits Marek Vasut
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161019201349.GS2494@denix.org \
--to=denis@denix.org \
--cc=marex@denx.de \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox