[rocko/master][PATCH 1/4] external-linaro-toolchain: cleanup ..install.cmd and overwrite PV with correct version

[rocko/master][PATCH 1/4] external-linaro-toolchain: cleanup ..install.cmd and overwrite PV with correct version

[Denys Dmytriyenko]

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 .../recipes-core/meta/external-linaro-toolchain.bbappend         | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/meta-arago-distro/recipes-core/meta/external-linaro-toolchain.bbappend b/meta-arago-distro/recipes-core/meta/external-linaro-toolchain.bbappend
index 306c547..8addc91 100644
--- a/meta-arago-distro/recipes-core/meta/external-linaro-toolchain.bbappend
+++ b/meta-arago-distro/recipes-core/meta/external-linaro-toolchain.bbappend
@@ -10,6 +10,9 @@ KERNEL_GIT_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git"
 KERNEL_GIT_PROTOCOL = "git"
 SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH}"
 
+PKGV_linux-libc-headers-dev = "4.14"
+PKGV_linux-libc-headers = "4.14"
+
 inherit kernel-arch pkgconfig multilib_header
 
 EXTRA_OEMAKE = " HOSTCC="${BUILD_CC}" HOSTCPP="${BUILD_CPP}""
@@ -23,11 +26,11 @@ do_install_append() {
 	cd ${WORKDIR}/git
 	oe_runmake headers_install INSTALL_HDR_PATH=${B}${exec_prefix}
 
-	# The ..install.cmd conflicts between various configure runs
-	find ${B}${includedir} -name ..install.cmd | xargs rm -f
-
 	CP_ARGS="-Prf --preserve=mode,timestamps --no-preserve=ownership"
 	cp ${CP_ARGS} ${B}${includedir} ${D}${exec_prefix}
+
+	# The ..install.cmd conflicts between various configure runs
+	find ${D}${exec_prefix} -name ..install.cmd | xargs rm -f
 }
 
 do_install_append_aarch64 () {
-- 
2.7.4

[rocko/master][PATCH 2/4] cmake: move help files into -doc package

[Denys Dmytriyenko]

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 meta-arago-distro/recipes-devtools/cmake/cmake_%.bbappend | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 meta-arago-distro/recipes-devtools/cmake/cmake_%.bbappend

diff --git a/meta-arago-distro/recipes-devtools/cmake/cmake_%.bbappend b/meta-arago-distro/recipes-devtools/cmake/cmake_%.bbappend
new file mode 100644
index 0000000..042e4d7
--- /dev/null
+++ b/meta-arago-distro/recipes-devtools/cmake/cmake_%.bbappend
@@ -0,0 +1 @@
+FILES_${PN}-doc += "${datadir}/cmake-${CMAKE_MAJOR_VERSION}/Help/"
-- 
2.7.4

[rocko/master][PATCH 3/4] packagegroup-arago-tisdk-addons: explicitly RDEPENDS on linux-libc-headers

[Denys Dmytriyenko]

Now that it's part of external-linaro-toolchain, it doesn't get into RDEPENDS
chain automatically.

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 .../recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
index 31ff258..7d3f567 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Task to install additional utilities/demos for SDKs"
 LICENSE = "MIT"
-PR = "r66"
+PR = "r67"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -116,6 +116,7 @@ EXTRA_LIBS_append_ti33x = " \
 "
 
 DEVTOOLS = " \
+    linux-libc-headers-dev \
     packagegroup-core-buildessential \
     packagegroup-core-tools-debug \
     git \
-- 
2.7.4

[rocko/master][PATCH 4/4] arago.conf: bump distro version

[Denys Dmytriyenko]

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 meta-arago-distro/conf/distro/arago.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf
index dd4253f..6dc98a9 100644
--- a/meta-arago-distro/conf/distro/arago.conf
+++ b/meta-arago-distro/conf/distro/arago.conf
@@ -1,6 +1,6 @@
 # Name and version of the distribution
 DISTRO_NAME = "Arago"
-DISTRO_VERSION = "2018.02"
+DISTRO_VERSION = "2018.04"
 DISTRO_FEED_URI ?= "http://lcpd.gt.design.ti.com"
 BUILD_VARIANT = "${@['prod','rt','systest'][int(d.getVar('ARAGO_RT_ENABLE'))+int(d.getVar('ARAGO_SYSTEST_ENABLE'))*2]}"
 FEEDURIPREFIX ?= "packages/${DISTRO}-master/${BUILD_VARIANT}/"
-- 
2.7.4