diff options
| author | Vyacheslav Pedash <vyacheslav.pedash@globallogic.com> | 2021-03-11 17:32:31 +0200 |
|---|---|---|
| committer | John Klug <john.klug@multitech.com> | 2021-03-11 11:58:37 -0600 |
| commit | 1f43b9d0490e2cefd725fadfff67d0042e9e40f9 (patch) | |
| tree | 428ef45a95df89623291a759d8ee9ecabb5c6267 | |
| parent | 9f96d6b878216d9a3ea5f1cd2dad5171c7cad6a2 (diff) | |
| download | meta-multitech-atmel-1f43b9d0490e2cefd725fadfff67d0042e9e40f9.tar.gz meta-multitech-atmel-1f43b9d0490e2cefd725fadfff67d0042e9e40f9.tar.bz2 meta-multitech-atmel-1f43b9d0490e2cefd725fadfff67d0042e9e40f9.zip | |
MTX-3899 Fix PR values
The value of WORKDIR variable depends on PR. If PR and consequently WORKDIR
changes its value build will fail because values in butbake cache will not correspond
to the real ones. KERNEL_MODULE_PACKAGE_SUFFIX is derived from files in kernel
staging directory and cosequenlty recives expected value only when kernel shared
directory is populated. Therefore, it can not be used in PR.
PR values are set to constant strings and to preserve current package names
KERNEL_MODULE_PACKAGE_SUFFIX is added to PKGR
| -rw-r--r-- | recipes-kernel/rs9113/rs9113-from-src_1.6.1.bb | 4 | ||||
| -rw-r--r-- | recipes-kernel/rs9113/rs9113_1.6.1.bb | 7 | ||||
| -rw-r--r-- | recipes-kernel/vizzini/vizzini.inc | 9 | ||||
| -rw-r--r-- | recipes-kernel/vizzini/vizzini_1.1.bb | 3 |
4 files changed, 11 insertions, 12 deletions
diff --git a/recipes-kernel/rs9113/rs9113-from-src_1.6.1.bb b/recipes-kernel/rs9113/rs9113-from-src_1.6.1.bb index 05ba21a..ab00f26 100644 --- a/recipes-kernel/rs9113/rs9113-from-src_1.6.1.bb +++ b/recipes-kernel/rs9113/rs9113-from-src_1.6.1.bb @@ -2,7 +2,9 @@ DESCRIPTION = "USB Driver for Redpine RS9113" LICENSE = "Proprietary" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28" PROVIDES = "rs9113-from-src" -PR = "r10${KERNEL_MODULE_PACKAGE_SUFFIX}" +PR = "r10" +PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}" +do_fetch[depends] += "virtual/kernel:do_shared_workdir" INHIBIT_PACKAGE_STRIP = "1" BB_STRICT_CHECKSUM = "0" inherit module diff --git a/recipes-kernel/rs9113/rs9113_1.6.1.bb b/recipes-kernel/rs9113/rs9113_1.6.1.bb index f968a4f..edab39c 100644 --- a/recipes-kernel/rs9113/rs9113_1.6.1.bb +++ b/recipes-kernel/rs9113/rs9113_1.6.1.bb @@ -17,13 +17,16 @@ COMPATIBLE_MACHINE = "(mtcdt|mtrv1)" # To update this, manually copy ipk from Jenkin's job to # git://git@${MTS_INTERNAL_GIT}/mlinux/ipk.git;protocol=ssh;branch=${PV} # -PR = "r10${KERNEL_MODULE_PACKAGE_SUFFIX}" +PR = "r10" + +PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}" + SRC_URI = " \ file://rs9113/rs9113.init \ file://rs9113/rs9113.default \ file://rs9113/mts-rm-rs9113 \ file://rs9113/wpa_supplicant \ - file://rs9113-ipk/rs9113-from-src_${PV}-${PR}.0_${MACHINE}.ipk;name=binaries \ + file://rs9113-ipk/rs9113-from-src_${PV}-${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}.0_${MACHINE}.ipk;name=binaries \ " SRCREV = "${PV}" diff --git a/recipes-kernel/vizzini/vizzini.inc b/recipes-kernel/vizzini/vizzini.inc index 48eb241..17120cf 100644 --- a/recipes-kernel/vizzini/vizzini.inc +++ b/recipes-kernel/vizzini/vizzini.inc @@ -15,16 +15,9 @@ SRC_URI = " \ inherit module inherit update-rc.d -EXTRA_OEMAKE = " -C ${STAGING_KERNEL_DIR} \ - M=${S} \ - modules \ +EXTRA_OEMAKE = "KERNELDIR=${STAGING_KERNEL_DIR} \ " -do_compile () { - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - oe_runmake -} - PACKAGES = "kernel-module-${PN} ${PN}-dev" FILES_kernel-module-${PN} = "${base_libdir}/modules/${KERNEL_VERSION}/extra/vizzini.ko" diff --git a/recipes-kernel/vizzini/vizzini_1.1.bb b/recipes-kernel/vizzini/vizzini_1.1.bb index 0cd1c5e..17bbe39 100644 --- a/recipes-kernel/vizzini/vizzini_1.1.bb +++ b/recipes-kernel/vizzini/vizzini_1.1.bb @@ -1,6 +1,7 @@ require vizzini.inc -PR = "r1.1${KERNEL_MODULE_PACKAGE_SUFFIX}" +PR = "r1.1" +PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}" SRC_URI += "file://xr21v141x-lnx3.10-3.11.tar.gz \ file://vizzini-1.1-enable-cts-v2.patch \ |