[PATCH 0/3] Updates and a bug fix

[PATCH 0/3] Updates and a bug fix

[Saul Wold]

Richard,

This has a couple of updates and a bugfix.

Sau!

Pascal Bach (1):
  base-passwd: Don't replace $ variables in passwd and group files

Saul Wold (2):
  mkfontscale: Upgrade to 1.1.2
  build-appliance-image: Upgrade for 1.8 Master

 meta/recipes-core/base-passwd/base-passwd_3.5.29.bb                   | 4 ++--
 .../{build-appliance-image_8.0.bb => build-appliance-image_12.0.1.bb} | 4 ++--
 .../xorg-app/{mkfontscale_1.1.1.bb => mkfontscale_1.1.2.bb}           | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename meta/recipes-core/images/{build-appliance-image_8.0.bb => build-appliance-image_12.0.1.bb} (96%)
 rename meta/recipes-graphics/xorg-app/{mkfontscale_1.1.1.bb => mkfontscale_1.1.2.bb} (80%)

-- 
2.1.0

[PATCH 1/3] mkfontscale: Upgrade to 1.1.2

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../xorg-app/{mkfontscale_1.1.1.bb => mkfontscale_1.1.2.bb}           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-app/{mkfontscale_1.1.1.bb => mkfontscale_1.1.2.bb} (80%)

diff --git a/meta/recipes-graphics/xorg-app/mkfontscale_1.1.1.bb b/meta/recipes-graphics/xorg-app/mkfontscale_1.1.2.bb
similarity index 80%
rename from meta/recipes-graphics/xorg-app/mkfontscale_1.1.1.bb
rename to meta/recipes-graphics/xorg-app/mkfontscale_1.1.2.bb
index 65f74c2..31cf186 100644
--- a/meta/recipes-graphics/xorg-app/mkfontscale_1.1.1.bb
+++ b/meta/recipes-graphics/xorg-app/mkfontscale_1.1.2.bb
@@ -14,5 +14,5 @@ BBCLASSEXTEND = "native"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=2e0d129d05305176d1a790e0ac1acb7f"
 
-SRC_URI[md5sum] = "03de3f15db678e277f5ef9c013aca1ad"
-SRC_URI[sha256sum] = "244017992477ced2397a44fd0ddcfb0f1d9899128613f5c4db81471163b0b731"
+SRC_URI[md5sum] = "9bdd6ebfa62b1bbd474906ac86a40fd8"
+SRC_URI[sha256sum] = "8c6d5228af885477b9aec60ca6f172578e7d2de42234357af62fb00439453f20"
-- 
2.1.0

[PATCH 2/3] build-appliance-image: Upgrade for 1.8 Master

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../{build-appliance-image_8.0.bb => build-appliance-image_12.0.1.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-core/images/{build-appliance-image_8.0.bb => build-appliance-image_12.0.1.bb} (96%)

diff --git a/meta/recipes-core/images/build-appliance-image_8.0.bb b/meta/recipes-core/images/build-appliance-image_12.0.1.bb
similarity index 96%
rename from meta/recipes-core/images/build-appliance-image_8.0.bb
rename to meta/recipes-core/images/build-appliance-image_12.0.1.bb
index 7651ff8..3d632d6 100644
--- a/meta/recipes-core/images/build-appliance-image_8.0.bb
+++ b/meta/recipes-core/images/build-appliance-image_12.0.1.bb
@@ -21,8 +21,8 @@ IMAGE_FSTYPES = "vmdk"
 
 inherit core-image
 
-SRCREV ?= "f0a2a2f44587f02fa7f434e82f91a6de2231f6b6"
-SRC_URI = "git://git.yoctoproject.org/poky;branch=dizzy \
+SRCREV ?= "d9d5b8b499af3ae01a1e33d0d3969c54c2d4ab1b"
+SRC_URI = "git://git.yoctoproject.org/poky \
            file://Yocto_Build_Appliance.vmx \
            file://Yocto_Build_Appliance.vmxf \
           "
-- 
2.1.0

[PATCH 3/3] base-passwd: Don't replace $ variables in passwd and group files

[Saul Wold]

From: Pascal Bach <pascal.bach@siemens.com>

This allows the usage of "$type$salt$encrypted_password" passwords in the passwd file.

Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-core/base-passwd/base-passwd_3.5.29.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb b/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb
index ec8f2af..a35ea9b 100644
--- a/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb
+++ b/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb
@@ -75,11 +75,11 @@ python populate_packages_prepend() {
     preinst = """#!/bin/sh
 mkdir -p $D${sysconfdir}
 if [ ! -e $D${sysconfdir}/passwd ]; then
-\tcat << EOF > $D${sysconfdir}/passwd
+\tcat << 'EOF' > $D${sysconfdir}/passwd
 """ + passwd + """EOF
 fi
 if [ ! -e $D${sysconfdir}/group ]; then
-\tcat << EOF > $D${sysconfdir}/group
+\tcat << 'EOF' > $D${sysconfdir}/group
 """ + group + """EOF
 fi
 """
-- 
2.1.0