[PATCH 1/6] ti-tisdk-makefile: Allow the defconfig name to be customized

[PATCH 1/6] ti-tisdk-makefile: Allow the defconfig name to be customized

[Franklin S. Cooper Jr]

From: "Franklin S. Cooper Jr" <fcooper@ti.com>

* Sitara-linux-ti-staging_3.14 used with the AMSDK branding doesn't use the
  tisdk defconfig.
* Therefore,  change the tisdk-makefiles to use the "right" defconfig.
* For other brandings the same tisdk_${MACHINE}_defconfig will be used.

Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
---
 .../ti-tisdk-makefile/Makefile_linux               |    2 +-
 .../ti-tisdk-makefile/ti-tisdk-makefile/Rules.make |    3 +++
 .../ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb     |    9 ++++++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_linux b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_linux
index 07d56b1..145e27c 100644
--- a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_linux
+++ b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_linux
@@ -3,7 +3,7 @@ linux: __DTB_DEPEND__
 	@echo =================================
 	@echo     Building the Linux Kernel
 	@echo =================================
-	$(MAKE) -C $(LINUXKERNEL_INSTALL_DIR) ARCH=arm CROSS_COMPILE=$(CROSS_COMPILE) tisdk_$(PLATFORM)_defconfig
+	$(MAKE) -C $(LINUXKERNEL_INSTALL_DIR) ARCH=arm CROSS_COMPILE=$(CROSS_COMPILE) $(DEFCONFIG)
 	$(MAKE) -j $(MAKE_JOBS) -C $(LINUXKERNEL_INSTALL_DIR) ARCH=arm CROSS_COMPILE=$(CROSS_COMPILE) __KERNEL_BUILD_CMDS__
 	$(MAKE) -j $(MAKE_JOBS) -C $(LINUXKERNEL_INSTALL_DIR) ARCH=arm CROSS_COMPILE=$(CROSS_COMPILE) modules
 
diff --git a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Rules.make b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Rules.make
index b2dbf64..9070781 100644
--- a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Rules.make
+++ b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Rules.make
@@ -1,6 +1,9 @@
 #platform
 PLATFORM=__PLATFORM__
 
+#defconfig
+DEFCONFIG=__DEFCONFIG__
+
 #Architecture
 ARCH=__ARCH__
 
diff --git a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
index e371307..ce6e557 100644
--- a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
+++ b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
@@ -36,7 +36,7 @@ SRC_URI = "\
     file://Makefile_cryptodev \
 "
 
-PR = "r36"
+PR = "r37"
 
 MAKEFILES_COMMON = "linux \
                     matrix-gui \
@@ -101,6 +101,12 @@ KERNEL_DEVICETREE_beaglebone = "am335x-bone.dtb am335x-boneblack.dtb"
 KERNEL_DEVICETREE_omap5-evm = "omap5-uevm.dtb"
 KERNEL_DEVICETREE_dra7xx = "dra7-evm.dtb dra72-evm.dtb am57xx-beagle-x15.dtb"
 
+DEFCONFIG = "tisdk_${MACHINE}_defconfig"
+
+AMSDK_DEFCONFIG = "singlecore-omap2plus_defconfig"
+
+DEFCONFIG := "${@base_conditional('ARAGO_BRAND','core','${DEFCONFIG}','${AMSDK_DEFCONFIG}',d)}"
+
 # This step will stitch together the final Makefile based on the supported
 # make targets.
 do_install () {
@@ -159,6 +165,7 @@ do_install () {
 
     # fixup Rules.make values
     sed -i -e "s/__PLATFORM__/${MACHINE}/" ${D}/Rules.make
+    sed -i -e "s/__DEFCONFIG__/${DEFCONFIG}/" ${D}/Rules.make
     sed -i -e "s/__ARCH__/${PLATFORM_ARCH}/" ${D}/Rules.make
     sed -i -e "s/__TOOLCHAIN_PREFIX__/${TOOLCHAIN_SYS}-/" ${D}/Rules.make
     sed -i -e "s/__UBOOT_MACHINE__/${UBOOT_MACHINE}/" ${D}/Rules.make
-- 
1.7.9.5

[PATCH 2/6] busybox: Add mpstat utility which is useful for multicore devices.

[Franklin S. Cooper Jr]

From: "Franklin S. Cooper Jr" <fcooper@ti.com>

Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
---
 .../recipes-core/busybox/busybox/defconfig         |    2 +-
 .../recipes-core/busybox/busybox_1.22.1.bbappend   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-arago-distro/recipes-core/busybox/busybox/defconfig b/meta-arago-distro/recipes-core/busybox/busybox/defconfig
index 69d7e5f..173a9c8 100644
--- a/meta-arago-distro/recipes-core/busybox/busybox/defconfig
+++ b/meta-arago-distro/recipes-core/busybox/busybox/defconfig
@@ -877,7 +877,7 @@ CONFIG_FEATURE_MIME_CHARSET=""
 # Process Utilities
 #
 # CONFIG_IOSTAT is not set
-# CONFIG_MPSTAT is not set
+CONFIG_MPSTAT=y
 # CONFIG_NMETER is not set
 # CONFIG_PMAP is not set
 # CONFIG_POWERTOP is not set
diff --git a/meta-arago-distro/recipes-core/busybox/busybox_1.22.1.bbappend b/meta-arago-distro/recipes-core/busybox/busybox_1.22.1.bbappend
index 0f49e64..a01a880 100644
--- a/meta-arago-distro/recipes-core/busybox/busybox_1.22.1.bbappend
+++ b/meta-arago-distro/recipes-core/busybox/busybox_1.22.1.bbappend
@@ -1,7 +1,7 @@
 # look for files in this layer first
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PR_append = "-arago13"
+PR_append = "-arago14"
 
 SRC_URI += " \
 	file://inetd \
-- 
1.7.9.5

[PATCH 3/6] sourceipk: Make the # of revisions preserved from shallow clone a variable

[Franklin S. Cooper Jr]

From: "Franklin S. Cooper Jr" <fcooper@ti.com>

* The size of the shallow clone depth really is a balancing act between how much
  space you want to save by ignoring commits compared to how much commits you
  want to preserve to make git log/git blame/gitk useful without requiring a
  fetch.
* Add a new variable that allows recipes to change alter the "depth" when the
  shallow git repository is created.

Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
---
 meta-arago-distro/classes/sourceipk.bbclass |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/meta-arago-distro/classes/sourceipk.bbclass b/meta-arago-distro/classes/sourceipk.bbclass
index 8fef2e9..6b16657 100644
--- a/meta-arago-distro/classes/sourceipk.bbclass
+++ b/meta-arago-distro/classes/sourceipk.bbclass
@@ -65,6 +65,12 @@ SRCIPK_PRESERVE_GIT ?= "false"
 # the sourceipk
 SRCIPK_SHALLOW_CLONE ?= "false"
 
+# By default limit the history to 1 commit since the user can always
+# use git pull --unshallow to fetch the rest of history.  The depth
+# level of 1 is set to keep from tracking through all merges and
+# pulling excess history
+SRCIPK_SHALLOW_DEPTH ?= "1"
+
 # This function will return the fetch URL for a git repository passed as
 # the first parameter.
 get_remote() {
@@ -100,11 +106,6 @@ get_remote() {
 #       than just a single branch the limited history will be a depth of
 #       1 for all branches and tags.
 limit_git_history() {
-    # By default limit the history to 1 commit since the user can always
-    # use git pull --unshallow to fetch the rest of history.  The depth
-    # level of 1 is set to keep from tracking through all merges and
-    # pulling excess history
-    commits="1"
 
     # Temporary directory to make shallow clones in
     gitshallowclone="${WORKDIR}/temp-git-shallow-clone"
@@ -117,7 +118,7 @@ limit_git_history() {
 
     remote=`get_remote $PWD`
 
-    git clone --depth $commits --branch ${BRANCH} file://$remote $gitshallowclone
+    git clone --depth ${SRCIPK_SHALLOW_DEPTH} --branch ${BRANCH} file://$remote $gitshallowclone
 
     # remove original kernel clone since we will replace it with the shallow
     # clone
-- 
1.7.9.5

[PATCH 4/6] sourceipk: Fix issue with git fetch when shallow clone is used

[Franklin S. Cooper Jr]

From: "Franklin S. Cooper Jr" <fcooper@ti.com>

* When shallow clone is used for some reason running git fetch on the repository
  didn't end up making it completely whole (fetch all commits).
* Even worse the copied repository didn't have a proper way to reference or
  fetch remote branches or tags.
* For some reason deleting the origin and seeing it back to the correct value
  fixed these problems.

Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
---
 meta-arago-distro/classes/sourceipk.bbclass |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta-arago-distro/classes/sourceipk.bbclass b/meta-arago-distro/classes/sourceipk.bbclass
index 6b16657..6895378 100644
--- a/meta-arago-distro/classes/sourceipk.bbclass
+++ b/meta-arago-distro/classes/sourceipk.bbclass
@@ -157,7 +157,11 @@ adjust_git() {
 
             cd -
 
-            git remote set-url origin $remote_repo $local_repo
+            # Some crazy reason I need to add these two lines when doing a
+            # shallow copy. Otherwise, I had problems where git fetch wasn't
+            # properly fetching all the commits and extra remotes.
+            git remote rm origin
+            git remote add origin $remote_repo
 
             # Repackage the repository so its a proper clone of the original
             # (remote) git repository
-- 
1.7.9.5

[PATCH 5/6] arago-source-ipk: Enable shallow clone for sitara-linux-ti-staging

[Franklin S. Cooper Jr]

From: "Franklin S. Cooper Jr" <fcooper@ti.com>

* Also increase the shallow clone depth

Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
---
 .../conf/distro/arago-source-ipk.conf              |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-arago-distro/conf/distro/arago-source-ipk.conf b/meta-arago-distro/conf/distro/arago-source-ipk.conf
index 5159dbb..1a5cf1b 100644
--- a/meta-arago-distro/conf/distro/arago-source-ipk.conf
+++ b/meta-arago-distro/conf/distro/arago-source-ipk.conf
@@ -158,6 +158,8 @@ CREATE_SRCIPK_pn-sitara-linux-ti-staging = "1"
 SRCIPK_INSTALL_DIR_pn-sitara-linux-ti-staging = "board-support/linux-${PV}${KERNEL_LOCALVERSION}"
 SRCIPK_PACKAGE_ARCH_pn-sitara-linux-ti-staging = "${MACHINE_ARCH}"
 SRCIPK_PRESERVE_GIT_pn-sitara-linux-ti-staging = "true"
+SRCIPK_SHALLOW_CLONE_pn-sitara-linux-ti-staging = "true"
+SRCIPK_SHALLOW_DEPTH_pn-sitara-linux-ti-staging = "400
 
 CREATE_SRCIPK_pn-linux-keystone = "1"
 SRCIPK_INSTALL_DIR_pn-linux-keystone = "board-support/linux-${PV}"
-- 
1.7.9.5

[PATCH 6/6] sitara-linux-ti-staging: Simply package up the sources don't copy the defconfig

[Franklin S. Cooper Jr]

From: "Franklin S. Cooper Jr" <fcooper@ti.com>

* Avoid creating a "new" defconfig when the one used by the recipe
  gives the same exact result.
* This also avoids the confusion people have when seeing a defconfig that
  doesn't exist in any other git tree.
* Doing this only makes sense if the defconfig is intree and not being patched.

Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
---
 .../linux/sitara-linux-ti-staging_3.14.bbappend    |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/meta-arago-distro/recipes-kernel/linux/sitara-linux-ti-staging_3.14.bbappend b/meta-arago-distro/recipes-kernel/linux/sitara-linux-ti-staging_3.14.bbappend
index b0b1df2..7e8eaf2 100644
--- a/meta-arago-distro/recipes-kernel/linux/sitara-linux-ti-staging_3.14.bbappend
+++ b/meta-arago-distro/recipes-kernel/linux/sitara-linux-ti-staging_3.14.bbappend
@@ -1,9 +1,7 @@
-MACHINE_KERNEL_PR_append = "-arago0"
+MACHINE_KERNEL_PR_append = "-arago1"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
 
-require copy-defconfig.inc
-
 KERNEL_LOCALVERSION = "-g${@d.getVar('SRCPV', True).partition('+')[2][0:7]}"
 
 kernel_do_configure_prepend() {
-- 
1.7.9.5

Re: [PATCH 6/6] sitara-linux-ti-staging: Simply package up the sources don't copy the defconfig

[Denys Dmytriyenko]

On Fri, Jan 30, 2015 at 04:31:39PM -0600, Franklin S. Cooper Jr wrote:
> From: "Franklin S. Cooper Jr" <fcooper@ti.com>
> 
> * Avoid creating a "new" defconfig when the one used by the recipe
>   gives the same exact result.
> * This also avoids the confusion people have when seeing a defconfig that
>   doesn't exist in any other git tree.
> * Doing this only makes sense if the defconfig is intree and not being patched.

Do you use config fragments in your kernel?


> Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
> ---
>  .../linux/sitara-linux-ti-staging_3.14.bbappend    |    4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/meta-arago-distro/recipes-kernel/linux/sitara-linux-ti-staging_3.14.bbappend b/meta-arago-distro/recipes-kernel/linux/sitara-linux-ti-staging_3.14.bbappend
> index b0b1df2..7e8eaf2 100644
> --- a/meta-arago-distro/recipes-kernel/linux/sitara-linux-ti-staging_3.14.bbappend
> +++ b/meta-arago-distro/recipes-kernel/linux/sitara-linux-ti-staging_3.14.bbappend
> @@ -1,9 +1,7 @@
> -MACHINE_KERNEL_PR_append = "-arago0"
> +MACHINE_KERNEL_PR_append = "-arago1"
>  
>  FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
>  
> -require copy-defconfig.inc
> -
>  KERNEL_LOCALVERSION = "-g${@d.getVar('SRCPV', True).partition('+')[2][0:7]}"
>  
>  kernel_do_configure_prepend() {
> -- 
> 1.7.9.5
> 
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Re: [PATCH 6/6] sitara-linux-ti-staging: Simply package up the sources don't copy the defconfig

[Cooper Jr., Franklin]

> On Jan 30, 2015, at 8:52 PM, Dmytriyenko, Denys <denys@ti.com> wrote:
> 
>> On Fri, Jan 30, 2015 at 04:31:39PM -0600, Franklin S. Cooper Jr wrote:
>> From: "Franklin S. Cooper Jr" <fcooper@ti.com>
>> 
>> * Avoid creating a "new" defconfig when the one used by the recipe
>>  gives the same exact result.
>> * This also avoids the confusion people have when seeing a defconfig that
>>  doesn't exist in any other git tree.
>> * Doing this only makes sense if the defconfig is intree and not being patched.
> 
> Do you use config fragments in your kernel?
Yes and no. I have a Jenkins job that generates configs based on the fragments but then commits them as apart of my git tree.

Just makes things easier for people to use.
> 
> 
>> Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
>> ---
>> .../linux/sitara-linux-ti-staging_3.14.bbappend    |    4 +---
>> 1 file changed, 1 insertion(+), 3 deletions(-)
>> 
>> diff --git a/meta-arago-distro/recipes-kernel/linux/sitara-linux-ti-staging_3.14.bbappend b/meta-arago-distro/recipes-kernel/linux/sitara-linux-ti-staging_3.14.bbappend
>> index b0b1df2..7e8eaf2 100644
>> --- a/meta-arago-distro/recipes-kernel/linux/sitara-linux-ti-staging_3.14.bbappend
>> +++ b/meta-arago-distro/recipes-kernel/linux/sitara-linux-ti-staging_3.14.bbappend
>> @@ -1,9 +1,7 @@
>> -MACHINE_KERNEL_PR_append = "-arago0"
>> +MACHINE_KERNEL_PR_append = "-arago1"
>> 
>> FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
>> 
>> -require copy-defconfig.inc
>> -
>> KERNEL_LOCALVERSION = "-g${@d.getVar('SRCPV', True).partition('+')[2][0:7]}"
>> 
>> kernel_do_configure_prepend() {
>> -- 
>> 1.7.9.5
>> 
>> _______________________________________________
>> meta-arago mailing list
>> meta-arago@arago-project.org
>> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Re: [PATCH 4/6] sourceipk: Fix issue with git fetch when shallow clone is used

[Denys Dmytriyenko]

On Fri, Jan 30, 2015 at 04:31:37PM -0600, Franklin S. Cooper Jr wrote:
> From: "Franklin S. Cooper Jr" <fcooper@ti.com>
> 
> * When shallow clone is used for some reason running git fetch on the repository
>   didn't end up making it completely whole (fetch all commits).
> * Even worse the copied repository didn't have a proper way to reference or
>   fetch remote branches or tags.
> * For some reason deleting the origin and seeing it back to the correct value
>   fixed these problems.

That all sounds like some kind of voodoo... :) What version of git were you 
using?


> Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
> ---
>  meta-arago-distro/classes/sourceipk.bbclass |    6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/meta-arago-distro/classes/sourceipk.bbclass b/meta-arago-distro/classes/sourceipk.bbclass
> index 6b16657..6895378 100644
> --- a/meta-arago-distro/classes/sourceipk.bbclass
> +++ b/meta-arago-distro/classes/sourceipk.bbclass
> @@ -157,7 +157,11 @@ adjust_git() {
>  
>              cd -
>  
> -            git remote set-url origin $remote_repo $local_repo
> +            # Some crazy reason I need to add these two lines when doing a
> +            # shallow copy. Otherwise, I had problems where git fetch wasn't
> +            # properly fetching all the commits and extra remotes.
> +            git remote rm origin
> +            git remote add origin $remote_repo
>  
>              # Repackage the repository so its a proper clone of the original
>              # (remote) git repository
> -- 
> 1.7.9.5
> 
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Re: [PATCH 4/6] sourceipk: Fix issue with git fetch when shallow clone is used

[Cooper Jr., Franklin]

> -----Original Message-----
> From: Dmytriyenko, Denys
> Sent: Monday, February 02, 2015 3:04 PM
> To: Cooper Jr., Franklin
> Cc: meta-arago@arago-project.org
> Subject: Re: [meta-arago] [PATCH 4/6] sourceipk: Fix issue with git fetch
> when shallow clone is used
> 
> On Fri, Jan 30, 2015 at 04:31:37PM -0600, Franklin S. Cooper Jr wrote:
> > From: "Franklin S. Cooper Jr" <fcooper@ti.com>
> >
> > * When shallow clone is used for some reason running git fetch on the
> repository
> >   didn't end up making it completely whole (fetch all commits).
> > * Even worse the copied repository didn't have a proper way to reference
> or
> >   fetch remote branches or tags.
> > * For some reason deleting the origin and seeing it back to the correct
> value
> >   fixed these problems.
> 
> That all sounds like some kind of voodoo... :) What version of git were you
> using?
> 
[Franklin] 1.7.9.5 that's the version used with Ubuntu 12.04.

> 
> > Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
> > ---
> >  meta-arago-distro/classes/sourceipk.bbclass |    6 +++++-
> >  1 file changed, 5 insertions(+), 1 deletion(-)
> >
> > diff --git a/meta-arago-distro/classes/sourceipk.bbclass b/meta-arago-
> distro/classes/sourceipk.bbclass
> > index 6b16657..6895378 100644
> > --- a/meta-arago-distro/classes/sourceipk.bbclass
> > +++ b/meta-arago-distro/classes/sourceipk.bbclass
> > @@ -157,7 +157,11 @@ adjust_git() {
> >
> >              cd -
> >
> > -            git remote set-url origin $remote_repo $local_repo
> > +            # Some crazy reason I need to add these two lines when doing a
> > +            # shallow copy. Otherwise, I had problems where git fetch wasn't
> > +            # properly fetching all the commits and extra remotes.
> > +            git remote rm origin
> > +            git remote add origin $remote_repo
> >
> >              # Repackage the repository so its a proper clone of the original
> >              # (remote) git repository
> > --
> > 1.7.9.5
> >
> > _______________________________________________
> > meta-arago mailing list
> > meta-arago@arago-project.org
> > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago