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

Fix /etc/version 

BugzID: 54169
This commit is contained in:
Alexandre Bard 2018-11-08 23:26:23 +01:00
parent 291e8603f9
commit 326b2247fb
5 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
classes/externalgitsrc.bbclass
View File

@ -11,6 +11,5 @@ def get_externalsrc_rev(d):
shell=True).strip() shell=True).strip()
rev = rev.decode("utf-8") rev = rev.decode("utf-8")
bb.note("got externsrc SRCPV: %s" % (rev))
return rev return rev

2
conf/distro/netmodule-linux.conf
View File

@ -90,3 +90,5 @@ PACKAGECONFIG_append_pn-nodejs = "openssl"
# Should not be here but is required when parsing recipes with meta-updater layer # Should not be here but is required when parsing recipes with meta-updater layer
OSTREE_INITRAMFS_FSTYPES = "ext4.gz.u-boot" OSTREE_INITRAMFS_FSTYPES = "ext4.gz.u-boot"
INHERIT += "externalgitsrc"

1
recipes-core/images/netmodule-linux-image-dev.bb
View File

@ -50,4 +50,3 @@ IMAGE_INSTALL_append = " \
devmem2 \ devmem2 \
" "
BUILDNAME .= "-dev"

3
recipes-core/images/netmodule-linux-image-minimal.bb
View File

@ -27,6 +27,5 @@ IMAGE_INSTALL = " \
LICENSE = "BSD" LICENSE = "BSD"
INHERIT += "externalgitsrc" BUILDNAME = "${EXTERNALSRC_GIT_SRCREV};${DATETIME};${PN}"
BUILDNAME = "${EXTERNALSRC_GIT_SRCREV};${DATETIME};netmodule-linux-image-minimal"

3
recipes-core/images/netmodule-linux-image.bb
View File

@ -119,8 +119,7 @@ IMAGE_PREPROCESS_COMMAND_sota += " moveRPMDatabase;"
IMAGE_BOOT_FILES = "MLO u-boot.img" IMAGE_BOOT_FILES = "MLO u-boot.img"
INHERIT += "externalgitsrc" BUILDNAME = "${EXTERNALSRC_GIT_SRCREV};${DATETIME};${PN}"
BUILDNAME = "${EXTERNALSRC_GIT_SRCREV};${DATETIME};netmodule-linux-image"
# Change the location of /var/lib/rpm to /usr/lib/rpm. # Change the location of /var/lib/rpm to /usr/lib/rpm.
# This makes the rpm package index consistent with installed packages. # This makes the rpm package index consistent with installed packages.