From: Denys Dmytriyenko <[email protected]> Move setting AUTOREV for important packages into branding-core, so it won't affect other SDK products using meta-arago/master.
Signed-off-by: Denys Dmytriyenko <[email protected]> --- meta-arago-distro/conf/distro/include/branding-core.inc | 5 +++++ .../recipes-bsp/u-boot/u-boot-ti-staging_2014.07.bbappend | 7 +------ meta-arago-distro/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bbappend | 5 +---- .../recipes-kernel/linux/linux-ti-staging_3.14.bbappend | 4 +--- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/meta-arago-distro/conf/distro/include/branding-core.inc b/meta-arago-distro/conf/distro/include/branding-core.inc index b1ae89b..b759469 100644 --- a/meta-arago-distro/conf/distro/include/branding-core.inc +++ b/meta-arago-distro/conf/distro/include/branding-core.inc @@ -4,3 +4,8 @@ # Please avoid creating multiple versions of the same brand, if possible # The policy is for the "Core" brand to be the default, # hence this file is mostly empty and used as a template + +# Auto rev important packages to pick up latest +SRCREV_pn-linux-ti-staging = "${AUTOREV}" +SRCREV_pn-u-boot-ti-staging = "${AUTOREV}" +SRCREV_pn-ltp-ddt = "${AUTOREV}" diff --git a/meta-arago-distro/recipes-bsp/u-boot/u-boot-ti-staging_2014.07.bbappend b/meta-arago-distro/recipes-bsp/u-boot/u-boot-ti-staging_2014.07.bbappend index 54a1691..872d0b2 100644 --- a/meta-arago-distro/recipes-bsp/u-boot/u-boot-ti-staging_2014.07.bbappend +++ b/meta-arago-distro/recipes-bsp/u-boot/u-boot-ti-staging_2014.07.bbappend @@ -1,12 +1,7 @@ -# Append the base 2014.07 u-boot mainline recipe to AUTOREV for now so that -# we can test the latest mainline - -PR_append = "-arago4" +PR_append = "-arago5" UBOOT_LOCALVERSION = "-g${@d.getVar('SRCPV', True).partition('+')[2][0:7]}" -SRCREV = "${AUTOREV}" - # AM57x EVM is currently on a seperate git tree/branch. # Once the software has been integrated to the u-boot-ti-staging # repository these lines can be removed. diff --git a/meta-arago-distro/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bbappend b/meta-arago-distro/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bbappend index 8332150..8e49900 100644 --- a/meta-arago-distro/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bbappend +++ b/meta-arago-distro/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bbappend @@ -1,10 +1,7 @@ -PR_append = "-arago8+gitr${SRCPV}" +PR_append = "-arago9+gitr${SRCPV}" RDEPENDS_${PN} += "linaro-pm-qa-utils" -# Auto rev so we pick up the latest changes -SRCREV = "${AUTOREV}" - SRC_URI_remove = "file://0001-KERNEL_INC-in-modern-kernel-should-point-at-toplevel.patch" EXTRA_OEMAKE += "KERNEL_PATH="${STAGING_KERNEL_DIR}"" diff --git a/meta-arago-distro/recipes-kernel/linux/linux-ti-staging_3.14.bbappend b/meta-arago-distro/recipes-kernel/linux/linux-ti-staging_3.14.bbappend index b178b5e..22d1f4f 100644 --- a/meta-arago-distro/recipes-kernel/linux/linux-ti-staging_3.14.bbappend +++ b/meta-arago-distro/recipes-kernel/linux/linux-ti-staging_3.14.bbappend @@ -1,4 +1,4 @@ -MACHINE_KERNEL_PR_append = "-arago1" +MACHINE_KERNEL_PR_append = "-arago2" FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:" @@ -6,8 +6,6 @@ require copy-defconfig.inc KERNEL_LOCALVERSION = "-g${@d.getVar('SRCPV', True).partition('+')[2][0:7]}" -SRCREV = "${AUTOREV}" - kernel_do_configure_prepend() { if [ ! -e ${B}/.scmversion -a ! -e ${S}/.scmversion ] then -- 2.1.2 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
