diff options
| -rw-r--r-- | recipes-kernel/rs9113/rs9113.inc | 13 | ||||
| -rw-r--r-- | recipes-kernel/rs9113/rs9113_1.5.0.bb | 9 |
2 files changed, 14 insertions, 8 deletions
diff --git a/recipes-kernel/rs9113/rs9113.inc b/recipes-kernel/rs9113/rs9113.inc index d7d169a..3b722cf 100644 --- a/recipes-kernel/rs9113/rs9113.inc +++ b/recipes-kernel/rs9113/rs9113.inc @@ -27,13 +27,18 @@ python do_fetch_prepend () { except TypeError: bb.fatal("MTS_INTERNAL_GIT must be in BB_ENV_EXTRAWHITE") - PV = d.getVar("PV",True) + gitversion = d.getVar("PV",True) + + PV = gitversion + PV += "-" + PV += d.getVar("MLINUX_KERNEL_VERSION",True) + PV += d.getVar("MLINUX_KERNEL_EXTRA_VERSION",True) + bb.note("PV is " + PV) - gt += ":mlinux/ipk.git " + PV + gt += ":mlinux/ipk.git " + gitversion bb.note("git is " + gt) - PR = d.getVar("PR",True) tar = "tar -vx --strip-components 1 -C " + DR + " rs9113/rs9113-from-src_" - tar += PV + "-" + PR + ".0_mtcdt.ipk" + tar += PV + ".0_mtcdt.ipk" bb.note("tar is " + tar) os.system(ex + ";" + gt + "|" + tar) } diff --git a/recipes-kernel/rs9113/rs9113_1.5.0.bb b/recipes-kernel/rs9113/rs9113_1.5.0.bb index 35fbb6b..fbfb706 100644 --- a/recipes-kernel/rs9113/rs9113_1.5.0.bb +++ b/recipes-kernel/rs9113/rs9113_1.5.0.bb @@ -14,13 +14,14 @@ FILES_${PN} = "/opt/rs9113 ${sbindir} ${sysconfdir}" # To update this, manually copy ipk from Jenkin's job to # git://git@${MTS_INTERNAL_GIT}/mlinux/ipk.git;protocol=ssh;branch=${PV} # -PR = "r0" +PR = "r0.${MLINUX_KERNEL_VERSION}${MLINUX_KERNEL_EXTRA_VERSION}" SRC_URI = " \ file://rs9113/rs9113.init \ file://rs9113/rs9113.default \ file://rs9113/wpa_supplicant \ - file://rs9113-ipk/rs9113-from-src_${PV}-${PR}.0_mtcdt.ipk \ + file://rs9113-ipk/rs9113-from-src_${PV}-${MLINUX_KERNEL_VERSION}${MLINUX_KERNEL_EXTRA_VERSION}.0_mtcdt.ipk \ " SRCREV = "${AUTOREV}" -SRC_URI[md5sum] = "a68f85a366928d85f9869bc2d921bfc1" -SRC_URI[sha256sum] = "3950b883d5e8fc3b929fd4e178ee67a65a0bd3881a427eb075b6b29ffb9930b3" +# For some reason the md5sum and sha256sum are ignored +SRC_URI[md5sum] = "def9fd10a77cae9df9bcb2e20626795e" +SRC_URI[sha256sum] = "367e942618143d4967273ce44120098a98e2ad1f543a9a404af7082b40c5066e" |