> -----Original Message-----
> From: Maupin, Chase
> Sent: Friday, August 23, 2013 9:36 AM
> To: Cooper Jr., Franklin; [email protected]; Rini, Tom
> Subject: RE: [meta-arago] [PATCH 3/4] board-port-labs: Use new
> SRCIPK_PRESERVE_GIT git feature in sourceipk.bbclass
>
> >-----Original Message-----
> >From: [email protected] [mailto:meta-arago-
> >[email protected]] On Behalf Of Cooper Jr., Franklin
> >Sent: Thursday, August 22, 2013 5:11 PM
> >To: [email protected]
> >Cc: Cooper Jr., Franklin
> >Subject: [meta-arago] [PATCH 3/4] board-port-labs: Use new
> >SRCIPK_PRESERVE_GIT git feature in sourceipk.bbclass
> >
> >* Do to the inability to keep the git repository intact the board port
> >labs
> > recipe manually ran git clone which took a very long time every time
> >the
> > recipe was built.
> >* Using the new SRCIPK_PRESERVE_GIT feature in sourceipk.bbclass the
> > repositories can now be treated like any other recipe and allow OE to
> >handle
> > the cloning and unpacking.
> >* This will significantly shorten the amount of time required to
> >rebuild this
> > recipe.
> >* Separate board-port-labs recipes into two.
> >
> >Signed-off-by: Franklin S. Cooper Jr <[email protected]>
> >---
> > meta-arago-distro/classes/sourceipk.bbclass | 1 -
> > .../board-port-labs/board-port-labs-linux_git.bb | 36
> >++++++++++++++++++++
> > .../board-port-labs/board-port-labs-u-boot_git.bb | 36
> >++++++++++++++++++++
> > .../recipes-tisdk/board-port-labs/files/LICENSE | 16
> >+++++++++
> > 4 files changed, 88 insertions(+), 1 deletions(-) create mode 100644
> >meta-arago-distro/recipes-tisdk/board-port-
> >labs/board-port-labs-linux_git.bb
> > create mode 100644 meta-arago-distro/recipes-tisdk/board-port-
> >labs/board-port-labs-u-boot_git.bb
> > create mode 100644 meta-arago-distro/recipes-tisdk/board-port-
> >labs/files/LICENSE
> >
> >diff --git a/meta-arago-distro/classes/sourceipk.bbclass b/meta-
> >arago-distro/classes/sourceipk.bbclass
> >index 0f0c633..1ea0577 100644
> >--- a/meta-arago-distro/classes/sourceipk.bbclass
> >+++ b/meta-arago-distro/classes/sourceipk.bbclass
> >@@ -61,7 +61,6 @@ SRCIPK_INCLUDE_EXTRAFILES ?= "1"
> >
> > SRCIPK_PRESERVE_GIT ?= "false"
> >
> >-# Remove git repositories before packaging up the sources
> > adjust_git() {
>
> This hunk should be part of the previous patch.
>
> >
> > orig_dir="$PWD"
> >diff --git a/meta-arago-distro/recipes-tisdk/board-port-
> >labs/board-port-labs-linux_git.bb b/meta-arago-distro/recipes-
> >tisdk/board-port-labs/board-port-labs-linux_git.bb
> >new file mode 100644
> >index 0000000..a105128
> >--- /dev/null
> >+++ b/meta-arago-distro/recipes-tisdk/board-port-labs/board-port-
> >labs-linux_git.bb
> >@@ -0,0 +1,36 @@
> >+DESCRIPTION = "Git repositories containing sample board port
> >code"
> >+HOMEPAGE = "https://gitorious.org/sitara-board-port";
> >+LICENSE = "GPLv2"
> >+
> >+LIC_FILES_CHKSUM =
> >"file://../LICENSE;md5=d9fb2a547cd8e6bb75c0ecf427a139a9"
>
> Why not point to the COPYING file in the kernel sources?
[Franklin] I don't know why we didn't do it in the first place now that you
mention it. I can use the license from both the kernel and u-boot sources.
>
> >+
> >+inherit allarch
> >+
> >+CREATE_SRCIPK = "1"
> >+SRCIPK_INSTALL_DIR = "board-support/board-port-labs/sitara-board-
> >port-linux"
> >+SRCIPK_PRESERVE_GIT = "true"
> >+
> >+PR = "r0"
> >+
> >+BRANCH = "master"
> >+SRC_URI = "git://gitorious.org/sitara-board-port/sitara-board-
> >port-linux.git;protocol=git;branch=${BRANCH} \
> >+ file://LICENSE"
> >+
> >+SRCREV = "${AUTOREV}"
> >+
> >+S = "${WORKDIR}/git"
> >+
> >+adjust_git_prepend() {
> >+
> >+ # Checkout a specific branch instead of a commit that is used
> >by default
> >+ git checkout ${BRANCH}
> >+}
>
> Any reason this couldn't actually be part of the adjust_git function by
> default? If
> a BRANCH is defined do this?
[Franklin] So the branch option is weird. Bitbake doesn't checkout a branch it
does a checkout of a commit id. So I don't understand the point of the branch
variable since a commit id (SRC_REV) can come from multiple branches. I assume
that specifying branch is only useful if you use AUTOREV.
For board port labs assumptions can be made since what I really want is the
latest commit in a branch so doing a checkout of master works well. Majority of
recipes want a specific commit and not the HEAD of a branch so doing it by
default can cause problems.
>
> >+
> >+do_configure() {
> >+ :
> >+}
> >+
> >+do_compile() {
> >+ :
> >+}
> >+
> >diff --git a/meta-arago-distro/recipes-tisdk/board-port-
> >labs/board-port-labs-u-boot_git.bb b/meta-arago-distro/recipes-
> >tisdk/board-port-labs/board-port-labs-u-boot_git.bb
> >new file mode 100644
> >index 0000000..a66eaa4
> >--- /dev/null
> >+++ b/meta-arago-distro/recipes-tisdk/board-port-labs/board-port-
> >labs-u-boot_git.bb
> >@@ -0,0 +1,36 @@
> >+DESCRIPTION = "Git repositories containing sample board port
> >code"
> >+HOMEPAGE = "https://gitorious.org/sitara-board-port";
> >+LICENSE = "GPLv2"
>
> U-Boot license in the base recipes are GPLv2+ so this probably needs to match.
>
> >+
> >+LIC_FILES_CHKSUM =
> >"file://../LICENSE;md5=d9fb2a547cd8e6bb75c0ecf427a139a9"
>
> Why not use the file in the sources at Licenses/gpl-2.0.txt?
>
> Tom, with all the licenses in that directory would you stay u-boot is still
> GPLv2+?
> It seems those other licenses are for the stand alone apps, but for source
> distribution should this license be updated to include the other licenses?
>
> >+
> >+inherit allarch
> >+
> >+CREATE_SRCIPK = "1"
> >+SRCIPK_INSTALL_DIR = "board-support/board-port-labs/sitara-board-
> >port-u-boot"
> >+SRCIPK_PRESERVE_GIT = "true"
> >+
> >+PR = "r0"
> >+
> >+BRANCH = "master"
> >+SRC_URI = "git://gitorious.org/sitara-board-port/sitara-board-
> >port-uboot.git;protocol=git;branch=${BRANCH} \
> >+ file://LICENSE"
> >+
> >+SRCREV = "${AUTOREV}"
> >+
> >+S = "${WORKDIR}/git"
> >+
> >+adjust_git_prepend() {
> >+
> >+ # Checkout a specific branch instead of a commit that is used
> >by default
> >+ git checkout ${BRANCH}
> >+}
>
> Same comment as the kernel
>
> >+
> >+do_configure() {
> >+ :
> >+}
> >+
> >+do_compile() {
> >+ :
> >+}
> >+
> >diff --git a/meta-arago-distro/recipes-tisdk/board-port-
> >labs/files/LICENSE b/meta-arago-distro/recipes-tisdk/board-port-
> >labs/files/LICENSE
> >new file mode 100644
> >index 0000000..738cb23
> >--- /dev/null
> >+++ b/meta-arago-distro/recipes-tisdk/board-port-
> >labs/files/LICENSE
> >@@ -0,0 +1,16 @@
> >+The trees found within this directory are git trees for the Linux
> >+kernel and u-boot. These trees are based on the AM335x part and are
> >+meant to serve as a reference for general tasks involved in a
> >board
> >+port. These trees go along with the training available at:
> >+
> >+http://processors.wiki.ti.com/index.php/Sitara_Linux_Training
> >+
> >+Inside of each directory is a full git repository. These
> >repositories
> >+have tags that make isolating the changes for each functionality
> >easier.
> >+You can view the tag using the "git tag" command and use "gitk --
> >all"
> >+to better view the git tree contents.
> >+
> >+The individual trees are licensed under the same license as the
> >Linux
> >+kernel and u-boot sources which is the GPLv2 license. A copy of
> >license
> >+for the kernel and u-boot can be found in a file called COPYING
> >within
> >+each of the respective git repositories.
>
> U-boot doesn't have COPYING.
>
> >--
> >1.7.0.4
> >
> >_______________________________________________
> >meta-arago mailing list
> >[email protected]
> >http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
