Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

base-files: rework '/etc/os-release' file 

* Do not hard-code the DISTRO* values and set them from the environment
* Move the build information to a different file (following commit)

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2013-05-28 18:40:22 +02:00
parent 08589f8942
commit 2b7fb6b3cf
2 changed files with 11 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
meta-digi-del/recipes-core/base-files/base-files/os-release
View File

@ -1,11 +1,6 @@
NAME="Digi Embedded Linux" NAME="##DISTRO_NAME##"
VERSION="1.0.0 (for Danny)" VERSION="##DISTRO_VERSION##"
ID=del ID=##DISTRO##
ID_LIKE=yocto ID_LIKE=yocto
VERSION_ID="1.0.0" VERSION_ID="##DISTRO_VERSION##"
PRETTY_NAME="Digi Embedded Linux 1.0.0 (for Danny)" PRETTY_NAME="##DISTRO_NAME## ##DISTRO_VERSION##"
BUILD CONFIGURATION
===================
BUILD_TIMESTAMP=##BUILD_TIMESTAMP##
DEL_TAG=##DEL_TAG##

25
meta-digi-del/recipes-core/base-files/base-files_3.0.14.bbappend
View File

@ -6,29 +6,16 @@ PR_append = "+${DISTRO}"
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
SRC_URI += " \ SRC_URI += " \
file://os-release \ file://os-release \
file://sysctl.conf \ file://sysctl.conf \
" "
TIMESTAMP = "${@time.strftime('%Y%m%d%H%M')}"
LAYERS_REV = "${@"\nLayers revisions:\n%s\n" % '\n'.join(get_layers_branch_rev(d))}"
DEL_TAG = "${@del_tag(d).strip()}"
def del_tag(d):
import subprocess
for layer in d.getVar('BBLAYERS', True).split():
if 'meta-digi-del' in layer:
cmd = 'git describe --tags --exact-match 2>/dev/null || true'
return subprocess.Popen(cmd, cwd=layer, shell=True, stdout=subprocess.PIPE).stdout.read()
return ""
do_install_append() { do_install_append() {
install -m 0644 ${WORKDIR}/os-release ${D}${sysconfdir}/ install -m 0644 ${WORKDIR}/os-release ${D}${sysconfdir}/
sed -i -e 's,##DEL_TAG##,${DEL_TAG},g' ${D}${sysconfdir}/os-release sed -i -e 's,##DISTRO##,${DISTRO},g' \
sed -i -e 's,##BUILD_TIMESTAMP##,${TIMESTAMP},g' ${D}${sysconfdir}/os-release -e 's,##DISTRO_NAME##,${DISTRO_NAME},g' \
cat >> ${D}${sysconfdir}/os-release <<-EOF -e 's,##DISTRO_VERSION##,${DISTRO_VERSION},g' \
${LAYERS_REV} ${D}${sysconfdir}/os-release
EOF
install -m 0644 ${WORKDIR}/sysctl.conf ${D}${sysconfdir}/ install -m 0644 ${WORKDIR}/sysctl.conf ${D}${sysconfdir}/
} }