LM
/
meta-netmodule-bsp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nbhw16: change system to select branch (kernel/u-boot) 

If we set the branch over SRCREV, it will not detect changes, so make
SRCREV AUTOREV and set a branch on the SRC_URI.
This commit is contained in:
Stefan Eichenberger 2016-07-07 15:30:29 +02:00
parent 80bdb4b99c
commit c6cf90e1f0
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conf/machine/am335x-nbhw16.conf
View File

@ -16,10 +16,10 @@ KERNEL_IMAGETYPE = "zImage"
UBOOT_MACHINE = "am335x_nbhw16_config"
PREFERRED_PROVIDER_virtual/bootloader = "u-boot-netmodule"
PREFERRED_VERSION_u-boot-netmodule = "v2016.04%"
SRCREV_pn-u-boot-netmodule = "nbhw16-2016.04"
BRANCH_pn-u-boot-netmodule = "nbhw16-2016.04"
PREFERRED_PROVIDER_virtual/kernel = "linux-netmodule"
SRCREV_pn-linux-netmodule = "nbhw16-4.4"
BRANCH_pn-linux-netmodule = "nbhw16-4.4"
PREFERRED_VERSION_linux = "4.4%"
SERIAL_CONSOLE = "115200 ttyO0"

2
conf/machine/armada-385-nbhw17-nb2800.conf
View File

@ -12,9 +12,9 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-modules kernel-devicetree"
KERNEL_DEFCONFIG = "nbhw_defconfig"
KERNEL_DEVICETREE = "armada-385-nbhw17-nb2800.dtb"
SRCREV_pn-linux-netmodule ?= "nmrouter-4.5"
PREFERRED_PROVIDER_virtual/kernel ?= "linux-netmodule"
PREFERRED_VERSION_linux ?= "4.5%"
BRANCH_pn-linux-netmodule = "nmrouter-4.5"
SERIAL_CONSOLE = "115200 ttyS0"

2
conf/machine/beaglebone.conf
View File

@ -16,7 +16,7 @@ KERNEL_IMAGETYPE = "zImage"
UBOOT_MACHINE = "am335x_boneblack_config"
PREFERRED_PROVIDER_virtual/kernel = "linux-netmodule"
SRCREV_pn-linux-netmodule = "nbhw16-4.4"
BRANCH_pn-linux-netmodule = "nbhw16-4.4"
PREFERRED_VERSION_linux = "4.4%"
SERIAL_CONSOLE = "115200 ttyO0"

5
recipes-bsp/u-boot/u-boot-netmodule_git.bb
View File

@ -2,9 +2,10 @@ require u-boot.inc
DEPENDS += "dtc-native"
SRCREV ??= "master"
SRCREV ?= "${AUTOREV}"
BRANCH ?= "master"
SRC_URI = "git://gitolite@git/usr/se/u-boot;protocol=ssh;nobranch=1"
SRC_URI = "git://gitolite@git/usr/se/u-boot;protocol=ssh;branch=${BRANCH}"
PV = "v2016.04+git${SRCPV}"

6
recipes-kernel/linux/linux-netmodule_git.bb
View File

@ -8,10 +8,10 @@ DESCRIPTION = "Linux kernel for various NetModule hardware"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
#SRC_URI = "git://git@gitlab.com/eichest/linux.git;protocol=ssh;nobranch=1"
SRC_URI = "git://gitolite@git/usr/se/linux;protocol=ssh;nobranch=1"
BRANCH ?= "master"
SRC_URI = "git://gitolite@git/usr/se/linux;protocol=ssh;branch=${BRANCH}"
SRCREV ??= "master"
SRCREV ?= "${AUTOREV}"
PV ?= "4.5-${SRCPV}"
PV_beaglebone = "4.4-${SRCPV}"
PV_am335x-nbhw16 = "4.4-${SRCPV}"