* [CONSOLIDATED PULL 1/6] libtasn1: update SRC_URI
2011-08-24 15:50 [CONSOLIDATED PULL 0/6] Bugfixes for M4 Saul Wold
@ 2011-08-24 15:50 ` Saul Wold
2011-08-24 15:50 ` [CONSOLIDATED PULL 2/6] procps: Fix lib path to support multilib Saul Wold
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Saul Wold @ 2011-08-24 15:50 UTC (permalink / raw)
To: openembedded-core
From: Joshua Lock <josh@linux.intel.com>
libtasn is no longer hosted as a sub-project of gnutls, it has its ftp
directory.
Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
meta/recipes-support/gnutls/libtasn1_2.9.bb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-support/gnutls/libtasn1_2.9.bb b/meta/recipes-support/gnutls/libtasn1_2.9.bb
index 63bb3c8..9a80005 100644
--- a/meta/recipes-support/gnutls/libtasn1_2.9.bb
+++ b/meta/recipes-support/gnutls/libtasn1_2.9.bb
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
PR = "r0"
-SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/libtasn1/libtasn1-${PV}.tar.gz"
+SRC_URI = "ftp://ftp.gnu.org/gnu/libtasn1/libtasn1-${PV}.tar.gz"
SRC_URI[md5sum] = "f4f4035b84550100ffeb8ad4b261dea9"
SRC_URI[sha256sum] = "fac46855fac8b08cf6f5a1b60cebad8e090bac1f06c335a044e84110d0b412c4"
--
1.7.6
^ permalink raw reply related [flat|nested] 8+ messages in thread* [CONSOLIDATED PULL 2/6] procps: Fix lib path to support multilib
2011-08-24 15:50 [CONSOLIDATED PULL 0/6] Bugfixes for M4 Saul Wold
2011-08-24 15:50 ` [CONSOLIDATED PULL 1/6] libtasn1: update SRC_URI Saul Wold
@ 2011-08-24 15:50 ` Saul Wold
2011-08-24 15:50 ` [CONSOLIDATED PULL 3/6] mips32: add mips32el tuning Saul Wold
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Saul Wold @ 2011-08-24 15:50 UTC (permalink / raw)
To: openembedded-core
From: Dongxiao Xu <dongxiao.xu@intel.com>
Revise the install.patch which hardcode the lib paths.
Change ${PN} to ${BPN} in file names.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
.../procps/procps-3.2.8/install.patch | 30 +++++++++++++------
meta/recipes-extended/procps/procps_3.2.8.bb | 8 ++--
2 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/meta/recipes-extended/procps/procps-3.2.8/install.patch b/meta/recipes-extended/procps/procps-3.2.8/install.patch
index b52a2c9..2a59a5f 100644
--- a/meta/recipes-extended/procps/procps-3.2.8/install.patch
+++ b/meta/recipes-extended/procps/procps-3.2.8/install.patch
@@ -1,20 +1,30 @@
Upstream-Status: Inappropriate [configuration]
---- procps-3.2.5.virgin/Makefile 2005-01-26 05:55:26.000000000 +0100
-+++ procps-3.2.5/Makefile 2005-08-03 04:55:26.346984488 +0200
-@@ -30,7 +30,10 @@
+diff -ruN procps-3.2.8-orig//Makefile procps-3.2.8/Makefile
+--- procps-3.2.8-orig//Makefile 2011-08-23 22:06:46.471163999 +0800
++++ procps-3.2.8/Makefile 2011-08-23 22:15:01.091163999 +0800
+@@ -29,9 +29,6 @@
+ ln_sf := ln -sf
install := install -D --owner 0 --group 0
- # Lame x86-64 /lib64 and /usr/lib64 abomination:
+-# Lame x86-64 /lib64 and /usr/lib64 abomination:
-lib64 := lib$(shell [ -d /lib64 ] && echo 64)
-+# lib64 := lib$(shell [ -d /lib64 ] && echo 64)
-+
-+# Equally lame hack to work around makefile lameness when the host arch is 64bit, but the target is not.
-+lib64 := lib
-
+-
usr/bin := $(DESTDIR)/usr/bin/
bin := $(DESTDIR)/bin/
-@@ -211,10 +214,10 @@
+ sbin := $(DESTDIR)/sbin/
+@@ -39,8 +36,8 @@
+ man1 := $(DESTDIR)/usr/share/man/man1/
+ man5 := $(DESTDIR)/usr/share/man/man5/
+ man8 := $(DESTDIR)/usr/share/man/man8/
+-lib := $(DESTDIR)/$(lib64)/
+-usr/lib := $(DESTDIR)/usr/$(lib64)/
++lib := $(DESTDIR)/$(base_libdir)/
++usr/lib := $(DESTDIR)/$(libdir)/
+ usr/include := $(DESTDIR)/usr/include/
+
+ #SKIP := $(bin)kill $(man1)kill.1
+@@ -222,10 +219,10 @@
###### install
$(BINFILES) : all
diff --git a/meta/recipes-extended/procps/procps_3.2.8.bb b/meta/recipes-extended/procps/procps_3.2.8.bb
index b1a7de7..a38077e 100644
--- a/meta/recipes-extended/procps/procps_3.2.8.bb
+++ b/meta/recipes-extended/procps/procps_3.2.8.bb
@@ -1,6 +1,6 @@
require procps.inc
-PR = "r1"
+PR = "r2"
inherit update-rc.d update-alternatives
@@ -22,10 +22,10 @@ SRC_URI += "file://procmodule.patch \
SRC_URI[md5sum] = "9532714b6846013ca9898984ba4cd7e0"
SRC_URI[sha256sum] = "11ed68d8a4433b91cd833deb714a3aa849c02aea738c42e6b4557982419c1535"
-FILES = "${bindir}/top.${PN} ${base_bindir}/ps.${PN} ${bindir}/uptime.${PN} ${base_bindir}/kill.${PN} \
- ${bindir}/free.${PN} ${bindir}/w ${bindir}/watch ${bindir}/pgrep ${bindir}/pmap ${bindir}/pwdx \
+FILES = "${bindir}/top.${BPN} ${base_bindir}/ps.${BPN} ${bindir}/uptime.${BPN} ${base_bindir}/kill.${BPN} \
+ ${bindir}/free.${BPN} ${bindir}/w ${bindir}/watch ${bindir}/pgrep ${bindir}/pmap ${bindir}/pwdx \
${bindir}/snice ${bindir}/vmstat ${bindir}/slabtop ${bindir}/pkill ${bindir}/skill ${bindir}/tload \
- ${base_sbindir}/sysctl.${PN}"
+ ${base_sbindir}/sysctl.${BPN}"
CONFFILES_${PN} = "${sysconfdir}/sysctl.conf"
--
1.7.6
^ permalink raw reply related [flat|nested] 8+ messages in thread* [CONSOLIDATED PULL 3/6] mips32: add mips32el tuning
2011-08-24 15:50 [CONSOLIDATED PULL 0/6] Bugfixes for M4 Saul Wold
2011-08-24 15:50 ` [CONSOLIDATED PULL 1/6] libtasn1: update SRC_URI Saul Wold
2011-08-24 15:50 ` [CONSOLIDATED PULL 2/6] procps: Fix lib path to support multilib Saul Wold
@ 2011-08-24 15:50 ` Saul Wold
2011-08-24 15:50 ` [CONSOLIDATED PULL 4/6] cronie: Updates to cronie Saul Wold
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Saul Wold @ 2011-08-24 15:50 UTC (permalink / raw)
To: openembedded-core
From: Phil Blundell <philb@gnu.org>
This makes building for little-endian mips32 slightly more convenient.
Signed-off-by: Phil Blundell <philb@gnu.org>
---
meta/conf/machine/include/tune-mips32.inc | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/meta/conf/machine/include/tune-mips32.inc b/meta/conf/machine/include/tune-mips32.inc
index 45792d8..4a5f0fa 100644
--- a/meta/conf/machine/include/tune-mips32.inc
+++ b/meta/conf/machine/include/tune-mips32.inc
@@ -6,6 +6,9 @@ TUNEVALID[mips32] = "Enable mips32 specific processor optimizations"
TUNE_CONFLICTS[mips32] = "n64 n32"
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "mips32", "-march=mips32", "", d)}"
-AVAILTUNES += "mips32"
+AVAILTUNES += "mips32 mips32el"
TUNE_FEATURES_tune-mips32 = "${TUNE_FEATURES_tune-mips} mips32"
PACKAGE_EXTRA_ARCHS_tune-mips32 = "mips"
+TUNE_FEATURES_tune-mips32el = "${TUNE_FEATURES_tune-mipsel} mips32"
+PACKAGE_EXTRA_ARCHS_tune-mips32el = "mipsel"
+
--
1.7.6
^ permalink raw reply related [flat|nested] 8+ messages in thread* [CONSOLIDATED PULL 4/6] cronie: Updates to cronie
2011-08-24 15:50 [CONSOLIDATED PULL 0/6] Bugfixes for M4 Saul Wold
` (2 preceding siblings ...)
2011-08-24 15:50 ` [CONSOLIDATED PULL 3/6] mips32: add mips32el tuning Saul Wold
@ 2011-08-24 15:50 ` Saul Wold
2011-08-24 15:50 ` [CONSOLIDATED PULL 5/6] libpam: Setting suid bit for unix_chkpwd Saul Wold
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Saul Wold @ 2011-08-24 15:50 UTC (permalink / raw)
To: openembedded-core
From: Wenzong Fan <wenzong.fan@windriver.com>
1) Add required pam plugins to RDEPENDS list;
2) Correct configure option that used for enable pam support;
3) Create empty crond config file cron.deny;
4) Don't set readonly variable UID in crond init script.
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
---
meta/recipes-extended/cronie/cronie/crond.init | 2 --
meta/recipes-extended/cronie/cronie_1.4.8.bb | 8 ++++++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-extended/cronie/cronie/crond.init b/meta/recipes-extended/cronie/cronie/crond.init
index 050c37e..08f34be 100755
--- a/meta/recipes-extended/cronie/cronie/crond.init
+++ b/meta/recipes-extended/cronie/cronie/crond.init
@@ -21,8 +21,6 @@ CONFIG=/etc/sysconfig/crond
# Source function library.
. /etc/init.d/functions
-UID=`id -u`
-
case "$1" in
start)
if [ $UID -ne 0 ] ; then
diff --git a/meta/recipes-extended/cronie/cronie_1.4.8.bb b/meta/recipes-extended/cronie/cronie_1.4.8.bb
index 4cfdfad..064347e 100644
--- a/meta/recipes-extended/cronie/cronie_1.4.8.bb
+++ b/meta/recipes-extended/cronie/cronie_1.4.8.bb
@@ -15,7 +15,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=963ea0772a2adbdcd607a9b2ec320c11 \
SECTION = "utils"
DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
-PR = "r0"
+RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_DEPS}', '', d)}"
+PAM_DEPS = "libpam libpam-runtime pam-plugin-access pam-plugin-loginuid"
+
+PR = "r1"
SRC_URI = "https://fedorahosted.org/releases/c/r/cronie/cronie-${PV}.tar.gz \
file://crond.init \
@@ -31,7 +34,7 @@ SRC_URI[sha256sum] = "a3b910876f255712f1a5c364b74f34b0ceac9f6f3bbc45e854c5722785
inherit autotools update-rc.d
EXTRA_OECONF += "\
- ${@base_contains('DISTRO_FEATURES', 'pam', '--with-libpam', '--without-libpam', d)}"
+ ${@base_contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)}"
INITSCRIPT_NAME = "crond"
INITSCRIPT_PARAMS = "start 90 2 3 4 5 . stop 60 0 1 6 ."
@@ -50,6 +53,7 @@ do_install_append () {
mkdir -p ${D}${sysconfdir}/cron.daily
mkdir -p ${D}${sysconfdir}/cron.weekly
mkdir -p ${D}${sysconfdir}/cron.monthly
+ touch ${D}${sysconfdir}/cron.deny
}
FILES_${PN} += "${sysconfdir}/cron*"
--
1.7.6
^ permalink raw reply related [flat|nested] 8+ messages in thread* [CONSOLIDATED PULL 5/6] libpam: Setting suid bit for unix_chkpwd
2011-08-24 15:50 [CONSOLIDATED PULL 0/6] Bugfixes for M4 Saul Wold
` (3 preceding siblings ...)
2011-08-24 15:50 ` [CONSOLIDATED PULL 4/6] cronie: Updates to cronie Saul Wold
@ 2011-08-24 15:50 ` Saul Wold
2011-08-24 15:50 ` [CONSOLIDATED PULL 6/6] initrdscripts: fix init-live.sh for hddimg and livecd Saul Wold
2011-08-24 18:17 ` [CONSOLIDATED PULL 0/6] Bugfixes for M4 Richard Purdie
6 siblings, 0 replies; 8+ messages in thread
From: Saul Wold @ 2011-08-24 15:50 UTC (permalink / raw)
To: openembedded-core
From: Wenzong Fan <wenzong.fan@windriver.com>
[YOCTO #1252]
While pam_unix.so required by an application on lsb image, it will need to
call the unix_chkpwd to get userinfo from shadow file. This fix get a normal
user could read shadow file via unix_chkpwd.
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
---
meta/recipes-extended/pam/libpam_1.1.4.bb | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-extended/pam/libpam_1.1.4.bb b/meta/recipes-extended/pam/libpam_1.1.4.bb
index ae20a97..d6f95b1 100644
--- a/meta/recipes-extended/pam/libpam_1.1.4.bb
+++ b/meta/recipes-extended/pam/libpam_1.1.4.bb
@@ -9,7 +9,7 @@ SECTION = "base"
LICENSE = "GPLv2+ | BSD"
LIC_FILES_CHKSUM = "file://COPYING;md5=ca0395de9a86191a078b8b79302e3083"
-PR = "r1"
+PR = "r2"
DEPENDS = "bison flex cracklib"
RDEPENDS_${PN}-runtime = "libpam pam-plugin-deny pam-plugin-permit pam-plugin-warn pam-plugin-unix"
@@ -85,3 +85,9 @@ do_install() {
install -d ${D}${sysconfdir}/pam.d/
install -m 0644 ${WORKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/
}
+
+pkg_postinst_pam-plugin-unix () {
+ # below is necessary to allow unix_chkpwd get user info from shadow file
+ # on lsb images
+ chmod 4755 ${sbindir}/unix_chkpwd
+}
--
1.7.6
^ permalink raw reply related [flat|nested] 8+ messages in thread* [CONSOLIDATED PULL 6/6] initrdscripts: fix init-live.sh for hddimg and livecd
2011-08-24 15:50 [CONSOLIDATED PULL 0/6] Bugfixes for M4 Saul Wold
` (4 preceding siblings ...)
2011-08-24 15:50 ` [CONSOLIDATED PULL 5/6] libpam: Setting suid bit for unix_chkpwd Saul Wold
@ 2011-08-24 15:50 ` Saul Wold
2011-08-24 18:17 ` [CONSOLIDATED PULL 0/6] Bugfixes for M4 Richard Purdie
6 siblings, 0 replies; 8+ messages in thread
From: Saul Wold @ 2011-08-24 15:50 UTC (permalink / raw)
To: openembedded-core
From: Jingdong Lu <jingdong.lu@windriver.com>
Both hddimg and livecd use init-live.sh script to boot the rootfs.img.
But the paths of rootfs.img in hddimg and livecd are different. So we add
a variable "ISOLINUX" to provide a correct path.
Signed-off-by: Jingdong Lu <jingdong.lu@windriver.com>
---
meta/recipes-core/initrdscripts/files/init-live.sh | 17 +++++++++++------
.../initrdscripts/initramfs-live-boot_1.0.bb | 2 +-
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/meta/recipes-core/initrdscripts/files/init-live.sh b/meta/recipes-core/initrdscripts/files/init-live.sh
index 1cd87e8..6a1deba 100644
--- a/meta/recipes-core/initrdscripts/files/init-live.sh
+++ b/meta/recipes-core/initrdscripts/files/init-live.sh
@@ -1,9 +1,10 @@
#!/bin/sh
ROOT_MOUNT="/rootfs/"
-ROOT_IMAGE="isolinux/rootfs.img"
+ROOT_IMAGE="rootfs.img"
MOUNT="/bin/mount"
UMOUNT="/bin/umount"
+ISOLINUX=""
early_setup() {
mkdir /proc
@@ -58,8 +59,12 @@ while true
do
for i in `ls /media 2>/dev/null`; do
if [ -f /media/$i/$ROOT_IMAGE ] ; then
- found="yes"
- break
+ found="yes"
+ break
+ elif [ -f /media/$i/isolinux/$ROOT_IMAGE ]; then
+ found="yes"
+ ISOLINUX="isolinux"
+ break
fi
done
if [ "$found" = "yes" ]; then
@@ -73,15 +78,15 @@ case $label in
mkdir $ROOT_MOUNT
mknod /dev/loop0 b 7 0
- if ! $MOUNT -o rw,loop,noatime,nodiratime /media/$i/$ROOT_IMAGE $ROOT_MOUNT ; then
+ if ! $MOUNT -o rw,loop,noatime,nodiratime /media/$i/$ISOLINUX/$ROOT_IMAGE $ROOT_MOUNT ; then
fatal "Couldnt mount rootfs image"
else
boot_live_root
fi
;;
install)
- if [ -f /media/$i/$ROOT_IMAGE ] ; then
- ./install.sh $i $ROOT_IMAGE $video_mode $vga_mode
+ if [ -f /media/$i/$ISOLINUX/$ROOT_IMAGE ] ; then
+ ./install.sh $i/$ISOLINUX $ROOT_IMAGE $video_mode $vga_mode
else
fatal "Couldnt find install script"
fi
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb
index 140fb1d..6d354b7 100644
--- a/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb
@@ -3,7 +3,7 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
SRC_URI = "file://init-live.sh"
-PR = "r4"
+PR = "r5"
do_install() {
install -m 0755 ${WORKDIR}/init-live.sh ${D}/init
--
1.7.6
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [CONSOLIDATED PULL 0/6] Bugfixes for M4
2011-08-24 15:50 [CONSOLIDATED PULL 0/6] Bugfixes for M4 Saul Wold
` (5 preceding siblings ...)
2011-08-24 15:50 ` [CONSOLIDATED PULL 6/6] initrdscripts: fix init-live.sh for hddimg and livecd Saul Wold
@ 2011-08-24 18:17 ` Richard Purdie
6 siblings, 0 replies; 8+ messages in thread
From: Richard Purdie @ 2011-08-24 18:17 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Wed, 2011-08-24 at 08:50 -0700, Saul Wold wrote:
> Richard,
>
> This is a set of bugfixes and cleanups for M4, please take a closer look
> at Dongxiao's procps change, which you commented on in the past.
>
> Thanks
> Sau!
>
>
> The following changes since commit 13e14763f14b5b84051ecb158404dcef937cc4e0:
>
> image.bbclass, kernel.bbclass: remove non-standard -n option from cp command (2011-08-23 18:32:24 -0700)
>
> are available in the git repository at:
> git://git.openembedded.org/openembedded-core-contrib sgw/stage
> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage
>
> Dongxiao Xu (1):
> procps: Fix lib path to support multilib
>
> Jingdong Lu (1):
> initrdscripts: fix init-live.sh for hddimg and livecd
>
> Joshua Lock (1):
> libtasn1: update SRC_URI
>
> Phil Blundell (1):
> mips32: add mips32el tuning
>
> Wenzong Fan (2):
> cronie: Updates to cronie
> libpam: Setting suid bit for unix_chkpwd
Merged to master, thanks.
Richard
^ permalink raw reply [flat|nested] 8+ messages in thread