Skip to contentSkip to conversation

One backport for jethro

PATCH New Paul Eggleton 1 participant 2 messages Feb 24, 2016

lore
Share & tools
lore
#0 lore raw

cover One backport for jethro

This is intended for after the imminent point release of course.

The following changes since commit 0c702756dd0009c4112028fbf2479a346867b32c:

build-appliance-image: Update to jethro head revision (2016-02-24 09:04:05 +0000)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib paule/jethro-fixes3
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/jethro-fixes3

Craig McQueen (1):
os-release: put double-quotes around variable contents

 meta/recipes-core/os-release/os-release.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Signature · 1 line
2.5.0
#1 lore raw

PATCH 1/1 os-release: put double-quotes around variable contents

From: Craig McQueen <[email protected]>

This makes the resulting /etc/os-release file have valid shell assignment syntax. This makes it loadable by a shell script, using the 'source' command:

source /etc/os-release

(From OE-Core master rev: f6e0ea000fa3b9a726ab56500f643f9902371618)

---
 meta/recipes-core/os-release/os-release.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/os-release/os-release.bb +1 -1
index c690b82..df19ca2 100644
@@ -29,7 +29,7 @@ python do_compile () {
         for field in d.getVar('OS_RELEASE_FIELDS', True).split():
             value = d.getVar(field, True)
             if value:
-                f.write('{0}={1}\n'.format(field, value))
+                f.write('{0}="{1}"\n'.format(field, value))
     if d.getVar('RPM_SIGN_PACKAGES', True) == '1':
         rpm_gpg_pubkey = d.getVar('RPM_GPG_PUBKEY', True)
         bb.utils.mkdirhier('${B}/rpm-gpg')
Signature · 1 line
2.5.0