[PATCH 0/2] x-load: fix broken beaglebone support and FILEPATHS usage

[PATCH 0/2] x-load: fix broken beaglebone support and FILEPATHS usage

[Petter Mabäcker]

The following changes since commit c446d4edca3b4edfcdee48247391bfb306aab4c2:

  default-distrovars.inc: Add libgcc-initial to the GPLv3 whitelist (same as libgcc) (2014-04-25 18:00:38 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib petmab/fix_xload
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=petmab/fix_xload

Petter Mabäcker (2):
  x-load: fix broken beaglebone support
  x-load: remove usage of FILESPATH

 .../x-load/x-load-git/beagleboard/name.patch       |   18 ----------
 .../0001-Change-omap3530beagle-target-name.patch   |   37 ++++++++++++++++++++
 meta/recipes-bsp/x-load/x-load_git.bb              |    6 ++--
 3 files changed, 39 insertions(+), 22 deletions(-)
 delete mode 100644 meta/recipes-bsp/x-load/x-load-git/beagleboard/name.patch
 create mode 100644 meta/recipes-bsp/x-load/x-load/beaglebone/0001-Change-omap3530beagle-target-name.patch

-- 
1.7.9.5

[PATCH 1/2] x-load: fix broken beaglebone support

[Petter Mabäcker]

When beagleboard was renamed to beaglebone, some parts in x-load was
missed. This caused x-load to fail when building it for beaglebone target.

Also use this commit to re-create the beaglebone patch name.patch using
git-format and write a proper patch description.

Signed-off-by: Petter Mabäcker <petter@technux.se>
---
 .../x-load/x-load-git/beagleboard/name.patch       |   18 ----------
 .../0001-Change-omap3530beagle-target-name.patch   |   37 ++++++++++++++++++++
 meta/recipes-bsp/x-load/x-load_git.bb              |    4 +--
 3 files changed, 39 insertions(+), 20 deletions(-)
 delete mode 100644 meta/recipes-bsp/x-load/x-load-git/beagleboard/name.patch
 create mode 100644 meta/recipes-bsp/x-load/x-load-git/beaglebone/0001-Change-omap3530beagle-target-name.patch

diff --git a/meta/recipes-bsp/x-load/x-load-git/beagleboard/name.patch b/meta/recipes-bsp/x-load/x-load-git/beagleboard/name.patch
deleted file mode 100644
index 29c26a9..0000000
--- a/meta/recipes-bsp/x-load/x-load-git/beagleboard/name.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: git/Makefile
-===================================================================
---- git.orig/Makefile
-+++ git/Makefile
-@@ -225,8 +225,9 @@ omap3evm_config :	unconfig
- overo_config :	unconfig
- 	@$(MKCONFIG) $(@:_config=) arm omap3 overo
- 
--omap3530beagle_config :    unconfig
--	@$(MKCONFIG) $(@:_config=) arm omap3 omap3530beagle
-+beagleboard_config :    unconfig
-+	@$(MKCONFIG) omap3530beagle arm omap3 omap3530beagle
-+	@./mkconfig omap3530beagle arm omap3 omap3530beagle
- 
- #########################################################################
- ## OMAP4 (ARM-CortexA9) Systems
diff --git a/meta/recipes-bsp/x-load/x-load-git/beaglebone/0001-Change-omap3530beagle-target-name.patch b/meta/recipes-bsp/x-load/x-load-git/beaglebone/0001-Change-omap3530beagle-target-name.patch
new file mode 100644
index 0000000..2d4195b
--- /dev/null
+++ b/meta/recipes-bsp/x-load/x-load-git/beaglebone/0001-Change-omap3530beagle-target-name.patch
@@ -0,0 +1,37 @@
+From 36642d018667950027fd6cbcc98cfa12b2c81ad1 Mon Sep 17 00:00:00 2001
+From: Petter Mabacker <petter@technux.se>
+Date: Fri, 25 Apr 2014 16:44:31 +0200
+Subject: [PATCH] Change omap3530beagle target name
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Support the usage of ${MACHINE}_config as proper target name for
+beaglebone.
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Petter Mabäcker <petter@technux.se>
+---
+ Makefile |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 1930db5..1410dae 100644
+--- a/Makefile
++++ b/Makefile
+@@ -222,8 +222,9 @@ omap3evm_config :	unconfig
+ overo_config :	unconfig
+ 	@$(MKCONFIG) $(@:_config=) arm omap3 overo
+ 
+-omap3530beagle_config :    unconfig
+-	@$(MKCONFIG) $(@:_config=) arm omap3 omap3530beagle
++beaglebone_config :    unconfig
++	@$(MKCONFIG) omap3530beagle arm omap3 omap3530beagle
++	@./mkconfig omap3530beagle arm omap3 omap3530beagle
+ 
+ igep0020_config :    unconfig
+ 	@$(MKCONFIG) $(@:_config=) arm omap3 igep0020
+-- 
+1.7.9.5
+
diff --git a/meta/recipes-bsp/x-load/x-load_git.bb b/meta/recipes-bsp/x-load/x-load_git.bb
index 65dc85c..5112349 100644
--- a/meta/recipes-bsp/x-load/x-load_git.bb
+++ b/meta/recipes-bsp/x-load/x-load_git.bb
@@ -12,10 +12,10 @@ PV = "1.5.0+git${SRCPV}"
 #SRC_URI = "git://gitorious.org/x-load-omap3/mainline.git;branch=master"
 SRC_URI = "git://gitorious.org/x-loader/x-loader.git;branch=master"
 
-SRC_URI_append_beagleboard = " file://name.patch "
+SRC_URI_append_beaglebone = " file://0001-Change-omap3530beagle-target-name.patch "
 
 S = "${WORKDIR}/git"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-COMPATIBLE_MACHINE = "(beagleboard|omap3evm|overo)"
+COMPATIBLE_MACHINE = "(beaglebone|omap3evm|overo)"
-- 
1.7.9.5

[PATCH 2/2] x-load: remove usage of FILESPATH

[Petter Mabäcker]

Usage of FILESPATH is discouraged, since it can make recipes harder to
bbappend. Instead FILESEXTRAPATHS should be used to extend the path.
However in x-load a better solution is to use a path that exists in
FILESPATH by default.

Signed-off-by: Petter Mabäcker <petter@technux.se>
---
 .../0001-Change-omap3530beagle-target-name.patch   |    0
 meta/recipes-bsp/x-load/x-load_git.bb              |    2 --
 2 files changed, 2 deletions(-)
 rename meta/recipes-bsp/x-load/{x-load-git => x-load}/beaglebone/0001-Change-omap3530beagle-target-name.patch (100%)

diff --git a/meta/recipes-bsp/x-load/x-load-git/beaglebone/0001-Change-omap3530beagle-target-name.patch b/meta/recipes-bsp/x-load/x-load/beaglebone/0001-Change-omap3530beagle-target-name.patch
similarity index 100%
rename from meta/recipes-bsp/x-load/x-load-git/beaglebone/0001-Change-omap3530beagle-target-name.patch
rename to meta/recipes-bsp/x-load/x-load/beaglebone/0001-Change-omap3530beagle-target-name.patch
diff --git a/meta/recipes-bsp/x-load/x-load_git.bb b/meta/recipes-bsp/x-load/x-load_git.bb
index 5112349..e5d9400 100644
--- a/meta/recipes-bsp/x-load/x-load_git.bb
+++ b/meta/recipes-bsp/x-load/x-load_git.bb
@@ -1,7 +1,5 @@
 require x-load.inc
 
-FILESPATH = "${FILE_DIRNAME}/x-load-git/${MACHINE}:${FILE_DIRNAME}/x-load-git/"
-
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://README;beginline=1;endline=25;md5=ef08d08cb99057bbb5b9d6d0c5a4396f"
 
-- 
1.7.9.5

Re: [PATCH 0/2] x-load: fix broken beaglebone support and FILEPATHS usage

[Gary Thomas]

On 2014-04-25 16:11, Petter Mabäcker wrote:
> The following changes since commit c446d4edca3b4edfcdee48247391bfb306aab4c2:
>
>    default-distrovars.inc: Add libgcc-initial to the GPLv3 whitelist (same as libgcc) (2014-04-25 18:00:38 +0100)
>
> are available in the git repository at:
>
>    git://git.yoctoproject.org/poky-contrib petmab/fix_xload
>    http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=petmab/fix_xload
>
> Petter Mabäcker (2):
>    x-load: fix broken beaglebone support
>    x-load: remove usage of FILESPATH
>
>   .../x-load/x-load-git/beagleboard/name.patch       |   18 ----------
>   .../0001-Change-omap3530beagle-target-name.patch   |   37 ++++++++++++++++++++
>   meta/recipes-bsp/x-load/x-load_git.bb              |    6 ++--
>   3 files changed, 39 insertions(+), 22 deletions(-)
>   delete mode 100644 meta/recipes-bsp/x-load/x-load-git/beagleboard/name.patch
>   create mode 100644 meta/recipes-bsp/x-load/x-load/beaglebone/0001-Change-omap3530beagle-target-name.patch
>

These changes don't seem quite correct since the beagleboard
wasn't renamed to be beaglebone - they are separate entities
and there are still beagleboard(s) out there (supported by
meta-ti)

At most, your changes should simply add support for beaglebone,
not remove support for beagleboard.

-- 
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------

Re: [PATCH 0/2] x-load: fix broken beaglebone support and FILEPATHS usage

[petter]

2014-04-26 15:10 skrev Gary Thomas:

> On 2014-04-25 16:11, Petter Mabäcker wrote:
>
>> The following changes since commit
>> c446d4edca3b4edfcdee48247391bfb306aab4c2: default-distrovars.inc: 
>> Add
>> libgcc-initial to the GPLv3 whitelist (same as libgcc) (2014-04-25
>> 18:00:38 +0100) are available in the git repository at:
>> git://git.yoctoproject.org/poky-contrib petmab/fix_xload
>>
> 
> http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=petmab/fix_xload
>> [1] Petter Mabäcker (2): x-load: fix broken beaglebone support 
>> x-load:
>> remove usage of FILESPATH 
>> .../x-load/x-load-git/beagleboard/name.patch
>> | 18 ---------- .../0001-Change-omap3530beagle-target-name.patch | 
>> 37
>> ++++++++++++++++++++ meta/recipes-bsp/x-load/x-load_git.bb | 6 ++-- 
>> 3
>> files changed, 39 insertions(+), 22 deletions(-) delete mode 100644
>> meta/recipes-bsp/x-load/x-load-git/beagleboard/name.patch create 
>> mode
>> 100644
>>
>
meta/recipes-bsp/x-load/x-load/beaglebone/0001-Change-omap3530beagle-target-name.patch
>
> These changes don't seem quite correct since the beagleboard
> wasn't renamed to be beaglebone - they are separate entities
> and there are still beagleboard(s) out there (supported by
> meta-ti)
>
> At most, your changes should simply add support for beaglebone,
> not remove support for beagleboard.
>
> --
> ------------------------------------------------------------
> Gary Thomas | Consulting for the
> MLB Associates | Embedded world
> ------------------------------------------------------------

Hi,

Thanks for your input. Beagleboard is not longer supported in YP. See: 
Yocto Bug #2444, that results in for example:

9680453 yocto-project-qs: Substituting Beaglebone for Beagleboard.
and
7254dfb Drop beagleboard, replaced by beaglebone

And usage of meta-ti layer to build beagleboard will override the 
x-load version within meta layer (from oe) anyway (see 
http://git.yoctoproject.org/cgit/cgit.cgi/meta-ti/tree/recipes-bsp/x-load/x-load_git.bb). 
So my opinion is that it's correct to replace beagleboard with 
beaglebone in this commit. But if you have any other opinion, please let 
me know and I will of course consider them.

Anyone else who have any comments about this?

BR,
Petter

Links:
------
[1] 
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=petmab/fix_xload

Re: [PATCH 0/2] x-load: fix broken beaglebone support and FILEPATHS usage

[Koen Kooi]

Op 26 apr. 2014, om 20:39 heeft petter@technux.se het volgende geschreven:

> 2014-04-26 15:10 skrev Gary Thomas:
> 
>> On 2014-04-25 16:11, Petter Mabäcker wrote:
>> 
>>> The following changes since commit
>>> c446d4edca3b4edfcdee48247391bfb306aab4c2: default-distrovars.inc: Add
>>> libgcc-initial to the GPLv3 whitelist (same as libgcc) (2014-04-25
>>> 18:00:38 +0100) are available in the git repository at:
>>> git://git.yoctoproject.org/poky-contrib petmab/fix_xload
>>> 
>> http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=petmab/fix_xload
>>> [1] Petter Mabäcker (2): x-load: fix broken beaglebone support x-load:
>>> remove usage of FILESPATH .../x-load/x-load-git/beagleboard/name.patch
>>> | 18 ---------- .../0001-Change-omap3530beagle-target-name.patch | 37
>>> ++++++++++++++++++++ meta/recipes-bsp/x-load/x-load_git.bb | 6 ++-- 3
>>> files changed, 39 insertions(+), 22 deletions(-) delete mode 100644
>>> meta/recipes-bsp/x-load/x-load-git/beagleboard/name.patch create mode
>>> 100644
>>> 
>> 
> meta/recipes-bsp/x-load/x-load/beaglebone/0001-Change-omap3530beagle-target-name.patch
>> 
>> These changes don't seem quite correct since the beagleboard
>> wasn't renamed to be beaglebone - they are separate entities
>> and there are still beagleboard(s) out there (supported by
>> meta-ti)
>> 
>> At most, your changes should simply add support for beaglebone,
>> not remove support for beagleboard.
>> 
>> --
>> ------------------------------------------------------------
>> Gary Thomas | Consulting for the
>> MLB Associates | Embedded world
>> ------------------------------------------------------------
> 
> Hi,
> 
> Thanks for your input. Beagleboard is not longer supported in YP. See: Yocto Bug #2444, that results in for example:
> 
> 9680453 yocto-project-qs: Substituting Beaglebone for Beagleboard.
> and
> 7254dfb Drop beagleboard, replaced by beaglebone
> 
> And usage of meta-ti layer to build beagleboard will override the x-load version within meta layer (from oe) anyway (seehttp://git.yoctoproject.org/cgit/cgit.cgi/meta-ti/tree/recipes-bsp/x-load/x-load_git.bb). So my opinion is that it's correct to replace beagleboard with beaglebone in this commit. But if you have any other opinion, please let me know and I will of course consider them.
> 
> Anyone else who have any comments about this?

X-load shouldn't be used anymore, it has been superseded by u-boot SPL some years ago for all cortex based TI SoCs.

Re: [PATCH 0/2] x-load: fix broken beaglebone support and FILEPATHS usage

[petter]

2014-04-27 11:52 skrev Koen Kooi:

> Op 26 apr. 2014, om 20:39 heeft petter@technux.sehet volgende 
> geschreven:
>
>> 2014-04-26 15:10 skrev Gary Thomas:
>>
>>> On 2014-04-25 16:11, Petter Mabäcker wrote:
>>>
>>>> The following changes since commit
>>>> c446d4edca3b4edfcdee48247391bfb306aab4c2: default-distrovars.inc:
>>>> Add libgcc-initial to the GPLv3 whitelist (same as libgcc)
>>>> (2014-04-25 18:00:38 +0100) are available in the git repository 
>>>> at:
>>>> git://git.yoctoproject.org/poky-contrib petmab/fix_xload
>>>
>>
> 
> http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=petmab/fix_xload
>>> [1]
>>>
>>>> [1] Petter Mabäcker (2): x-load: fix broken beaglebone support
>>>> x-load: remove usage of FILESPATH
>>>> .../x-load/x-load-git/beagleboard/name.patch | 18 ----------
>>>> .../0001-Change-omap3530beagle-target-name.patch | 37
>>>> ++++++++++++++++++++ meta/recipes-bsp/x-load/x-load_git.bb | 6 
>>>> ++--
>>>> 3 files changed, 39 insertions(+), 22 deletions(-) delete mode
>>>> 100644 meta/recipes-bsp/x-load/x-load-git/beagleboard/name.patch
>>>> create mode 100644
>>
>
meta/recipes-bsp/x-load/x-load/beaglebone/0001-Change-omap3530beagle-target-name.patch
>>
>>
>>> These changes don't seem quite correct since the beagleboard wasn't
>>> renamed to be beaglebone - they are separate entities and there are
>>> still beagleboard(s) out there (supported by meta-ti) At most, your
>>> changes should simply add support for beaglebone, not remove 
>>> support
>>> for beagleboard. --
>>> ------------------------------------------------------------ Gary
>>> Thomas | Consulting for the MLB Associates | Embedded world
>>> ------------------------------------------------------------
>> Hi, Thanks for your input. Beagleboard is not longer supported in 
>> YP.
>> See: Yocto Bug #2444, that results in for example: 9680453
>> yocto-project-qs: Substituting Beaglebone for Beagleboard. and 
>> 7254dfb
>> Drop beagleboard, replaced by beaglebone And usage of meta-ti layer 
>> to
>> build beagleboard will override the x-load version within meta layer
>> (from oe) anyway
>>
>
(seehttp://git.yoctoproject.org/cgit/cgit.cgi/meta-ti/tree/recipes-bsp/x-load/x-load_git.bb).
>> So my opinion is that it's correct to replace beagleboard with
>> beaglebone in this commit. But if you have any other opinion, please
>> let me know and I will of course consider them. Anyone else who have
>> any comments about this?
>
> X-load shouldn't be used anymore, it has been superseded by u-boot 
> SPL
> some years ago for all cortex based TI SoCs.

So we have another option here, that we should remove the recipe 
completely from meta layer. Since possibly users probably are using 
legacy boards together with meta-ti (that already has it's own version 
of x-load), I guess it might be a possible way forward.

Anyone else with any comments about this? If no objections exists I 
guess I can send up a new changeset that removes x-load instead, 
otherwise I vote for go forward with this changeset until someone 
decides that it's OK to remove x-load support.

/P


Links:
------
[1] 
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=petmab/fix_xload