From 497e6283e87d577fca5323ac124facc0fa87ee7d Mon Sep 17 00:00:00 2001 From: Ramon Moesching Date: Wed, 18 Sep 2019 09:33:50 +0200 Subject: [PATCH] wlconf-bin: repository reorganization: get rid of machine branches Avoid using machine branches which can lead into failling bitbake parsing process when branch does not exists. Signed-off-by: Ramon Moesching --- .../wlconf-bin/wlconf-bin_git.bb | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/recipes-connectivity/wlconf-bin/wlconf-bin_git.bb b/recipes-connectivity/wlconf-bin/wlconf-bin_git.bb index 2e11a13..4877acf 100644 --- a/recipes-connectivity/wlconf-bin/wlconf-bin_git.bb +++ b/recipes-connectivity/wlconf-bin/wlconf-bin_git.bb @@ -3,12 +3,10 @@ HOMEPAGE = "http://www.netmodule.com/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI = "git://git.netmodule.intranet/nm-tools/wlconf-bin.git;protocol=ssh;user=gitea;branch=${MACHINE}" - +SRC_URI = "git://git.netmodule.intranet/nm-tools/wlconf-bin.git;protocol=ssh;user=gitea;branch=master" S = "${WORKDIR}/git" SRCREV = "${AUTOREV}" -SRCREV_am335x-nmhw21 = "d4bb29b9794defbf25ce3b7cc7e0f190d5445bd9" INSTALLPATH = "${nonarch_base_libdir}/firmware/ti-connectivity" CONFIGBINARY = "wl18xx-conf.bin" @@ -16,9 +14,13 @@ CONFIGBINARY = "wl18xx-conf.bin" FILES_${PN} += "${nonarch_base_libdir}/firmware/" -do_install() { - install -d ${D}/${INSTALLPATH} - cp -a ${S}/wlconf-8.7.3/bin/${CONFIGBINARY} ${D}/${INSTALLPATH} --no-preserve=ownership - ln -sfr ${D}/${INSTALLPATH}/${CONFIGBINARY} ${D}${nonarch_base_libdir}/firmware/${CONFIGBINARY} +do_install () { + + install -d ${D}/${INSTALLPATH} + + if ls ${S}/wlconf-8.7.3/bin/${MACHINE}/${CONFIGBINARY} 1> /dev/null 2>&1 ; then + install -m 0644 ${S}/wlconf-8.7.3/bin/${MACHINE}/${CONFIGBINARY} ${D}/${INSTALLPATH} + ln -sfr ${D}/${INSTALLPATH}/${CONFIGBINARY} ${D}${nonarch_base_libdir}/firmware/${CONFIGBINARY} + fi }