Skip to contentSkip to conversation

A few misc recipe fixed

PATCH Applied Mark Hatle 2 participants 6 messages Jun 24, 2011 – Jun 30, 2011

lore
Share & tools
lore

Mark Hatle

author
#0 lore raw

cover A few misc recipe fixed

The problems with these recipes were detected over the course of a few make -k world builds.. This allows make world to complete.

The following changes since commit 3aec2fa2df9aaa883feda0d7aed85e63d01398b9:

qemuimagetest: update cvs and iptables to newer version for toolchain test (2011-06-24 11:28:28 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib mhatle/fix-recipe
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/fix-recipe

Mark Hatle (4):
gcc: Fix file ownership
rpm: Change config option
msmtp: Disable gnome keyring
linux-firmware: Fix file permissions

 .../recipes-devtools/gcc/gcc-configure-runtime.inc |    1 +
 meta/recipes-devtools/gcc/gcc-package-sdk.inc      |    2 ++
 meta/recipes-devtools/gcc/gcc-package-target.inc   |    2 ++
 meta/recipes-devtools/gcc/libgcc_4.5.1.bb          |    2 ++
 meta/recipes-devtools/gcc/libgcc_4.6.bb            |    2 ++
 meta/recipes-devtools/rpm/rpm_5.4.0.bb             |    2 +-
 meta/recipes-extended/msmtp/msmtp_1.4.24.bb        |    4 +++-
 .../linux-firmware/linux-firmware_git.bb           |    6 +++---
 8 files changed, 16 insertions(+), 5 deletions(-)
Signature · 1 line
1.7.3.4
author
#1 lore raw

PATCH 1/4 gcc: Fix file ownership

Most of the files that end up in the gcc include dir and other misc files scattered throughout the install get the build users uid and gid.

Signed-off-by Mark Hatle <[email protected]>
---
 .../recipes-devtools/gcc/gcc-configure-runtime.inc |    1 +
 meta/recipes-devtools/gcc/gcc-package-sdk.inc      |    2 ++
 meta/recipes-devtools/gcc/gcc-package-target.inc   |    2 ++
 meta/recipes-devtools/gcc/libgcc_4.5.1.bb          |    2 ++
 meta/recipes-devtools/gcc/libgcc_4.6.bb            |    2 ++
 5 files changed, 9 insertions(+), 0 deletions(-)
meta/recipes-devtools/gcc/gcc-configure-runtime.inc +1 -0
index 339a3c8..34bfaeb 100644
@@ -37,6 +37,7 @@ do_install () {
 		cd ${B}/$d/
 		oe_runmake 'DESTDIR=${D}' install
 	done
+	chown -R root:root ${D}
 }
 
 INHIBIT_DEFAULT_DEPS = "1"
meta/recipes-devtools/gcc/gcc-package-sdk.inc +2 -0
index 23b9a48..7db7c52 100644
@@ -48,5 +48,7 @@ do_install () {
 	for t in ar as ld nm objcopy objdump ranlib strip g77 gcc cpp gfortran; do
 		ln -sf ${bindir}/${TARGET_PREFIX}$t $dest$t
 	done
+
+	chown -R root:root ${D}
 }
meta/recipes-devtools/gcc/gcc-package-target.inc +2 -0
index afbcf0d..43e2bd5 100644
@@ -101,4 +101,6 @@ do_install () {
 	ln -sf g++ c++
 	ln -sf gcc cc
 	ln -sf ${bindir}/${TARGET_PREFIX}cpp ${D}${bindir}/cpp
+
+	chown -R root:root ${D}
 }
meta/recipes-devtools/gcc/libgcc_4.5.1.bb +2 -0
index b6cf268..b0523c7 100644
@@ -36,6 +36,8 @@ do_install () {
 	else
 		mv ${D}${libdir}/libgcc* ${D}${base_libdir} || true
 	fi
+
+	chown -R root:root ${D}
 }
 
 do_package_write_ipk[depends] += "virtual/libc:do_package"
meta/recipes-devtools/gcc/libgcc_4.6.bb +2 -0
index b6cf268..b0523c7 100644
@@ -36,6 +36,8 @@ do_install () {
 	else
 		mv ${D}${libdir}/libgcc* ${D}${base_libdir} || true
 	fi
+
+	chown -R root:root ${D}
 }
 
 do_package_write_ipk[depends] += "virtual/libc:do_package"
Signature · 1 line
1.7.3.4
author
#2 lore raw

PATCH 2/4 rpm: Change config option

In reply to Mark Hatle

For some reason --without-xz doesn't work the same as --with-xz=none.

We need this set to none, or configure will attempt to find an lzma header which we might or might not have.

Signed-off-by Mark Hatle <[email protected]>
---
 meta/recipes-devtools/rpm/rpm_5.4.0.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-devtools/rpm/rpm_5.4.0.bb +1 -1
index 0c88f91..91089d2 100644
@@ -84,7 +84,7 @@ rpm_macros_virtclass-native = "%{_usrlibrpm}/macros:%{_usrlibrpm}/poky/macros:%{
 # Configure values taken from rpm.spec
 WITH_BZIP2 = "--with-bzip2"
 
-WITH_XZ = "--without-xz"
+WITH_XZ = "--with-xz=none"
 
 WITH_Z = "--with-zlib $WITH_BZIP2 $WITH_XZ"
Signature · 1 line
1.7.3.4
author
#3 lore raw

PATCH 3/4 msmtp: Disable gnome keyring

In reply to Mark Hatle

Unless we explicitly disable the gnome keyring support, the system will attemp to discover if it's available which changes the package output.

Signed-off-by Mark Hatle <[email protected]>
---
 meta/recipes-extended/msmtp/msmtp_1.4.24.bb |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
meta/recipes-extended/msmtp/msmtp_1.4.24.bb +3 -1
index 39a7eea..7f646f8 100644
@@ -6,7 +6,7 @@ SECTION = "console/network"
 PRIORITY = "required"
 LICENSE = "GPLv3"
 DEPENDS = "zlib gnutls"
-PR = "r1"
+PR = "r2"
 
 
 #COPYING or Licence

@@ -20,6 +20,8 @@ SRC_URI[sha256sum] = "f19f3fcc67da448420b3adbd5add09f8fe110664dd64f3c2cd693ef0cb
 
 inherit gettext autotools update-alternatives
 
+EXTRA_OECONF += "--without-gnome-keyring"
+
 ALTERNATIVE_NAME = "sendmail"
 ALTERNATIVE_PATH = "${bindir}/msmtp"
 ALTERNATIVE_LINK = "${sbindir}/sendmail"
Signature · 1 line
1.7.3.4
author
#4 lore raw

PATCH 4/4 linux-firmware: Fix file permissions

In reply to Mark Hatle

The firmware was installed 0666 which could have been a security issue.

Signed-off-by Mark Hatle <[email protected]>
---
 .../linux-firmware/linux-firmware_git.bb           |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-kernel/linux-firmware/linux-firmware_git.bb +3 -3
index 3d822c5..29f1e78 100644
@@ -32,9 +32,9 @@ do_compile() {
 do_install() {
 	install -d  ${D}/lib/firmware/
 	# Libertas sd8686
-	install -m 0666 libertas/sd8686_v9.bin ${D}/lib/firmware/sd8686.bin
-	install -m 0666 libertas/sd8686_v9_helper.bin ${D}/lib/firmware/sd8686_helper.bin
-	install -m 0666 LICENCE.libertas ${D}/lib/firmware/
+	install -m 0644 libertas/sd8686_v9.bin ${D}/lib/firmware/sd8686.bin
+	install -m 0644 libertas/sd8686_v9_helper.bin ${D}/lib/firmware/sd8686_helper.bin
+	install -m 0644 LICENCE.libertas ${D}/lib/firmware/
 }
 
 PACKAGES = "${PN}-sd8686"
Signature · 1 line
1.7.3.4
Applied
#5 lore raw
In reply to Mark Hatle
Quoted 17 lines · Mark Hatle

The problems with these recipes were detected over the course of a few make -k world builds.. This allows make world to complete.

The following changes since commit 3aec2fa2df9aaa883feda0d7aed85e63d01398b9:

qemuimagetest: update cvs and iptables to newer version for toolchain test (2011-06-24 11:28:28 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib mhatle/fix-recipe
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/fix-recipe

Mark Hatle (4):
gcc: Fix file ownership
rpm: Change config option
msmtp: Disable gnome keyring
linux-firmware: Fix file permissions

Quoted 10 lines
  .../recipes-devtools/gcc/gcc-configure-runtime.inc |    1 +
  meta/recipes-devtools/gcc/gcc-package-sdk.inc      |    2 ++
  meta/recipes-devtools/gcc/gcc-package-target.inc   |    2 ++
  meta/recipes-devtools/gcc/libgcc_4.5.1.bb          |    2 ++
  meta/recipes-devtools/gcc/libgcc_4.6.bb            |    2 ++
  meta/recipes-devtools/rpm/rpm_5.4.0.bb             |    2 +-
  meta/recipes-extended/msmtp/msmtp_1.4.24.bb        |    4 +++-
  .../linux-firmware/linux-firmware_git.bb           |    6 +++---
  8 files changed, 16 insertions(+), 5 deletions(-)

Merged into OE-Core

Thanks
Sau!