* [CONSOLIDATED PULL 01/17] rootfs_ipk: implement FEED_DEPLOYDIR_BASE_URI support
2011-12-08 8:44 [CONSOLIDATED PULL 00/17] Master Fixes & Self-Hosted Fixes Saul Wold
@ 2011-12-08 8:44 ` Saul Wold
2011-12-08 8:44 ` [CONSOLIDATED PULL 02/17] image_types.bbclass: implement jffs2 summary images (sum.jffs2) Saul Wold
` (16 subsequent siblings)
17 siblings, 0 replies; 23+ messages in thread
From: Saul Wold @ 2011-12-08 8:44 UTC (permalink / raw)
To: openembedded-core
From: Eric Bénard <eric@eukrea.com>
this feature was present in OE-classic, is documented in OE-core
but its implementation is actually missing.
The present implementation is directly copied from OE-classic
and tested on an arm926 machine.
Signed-off-by: Eric Bénard <eric@eukrea.com>
---
meta/classes/rootfs_ipk.bbclass | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass
index b4b95c5..ec01951 100644
--- a/meta/classes/rootfs_ipk.bbclass
+++ b/meta/classes/rootfs_ipk.bbclass
@@ -205,7 +205,18 @@ ipk_insert_feed_uris () {
# insert new feed-sources
echo "src/gz $feed_name $feed_uri" >> ${IPKGCONF_TARGET}
- done
+ done
+
+ # Allow to use package deploy directory contents as quick devel-testing
+ # feed. This creates individual feed configs for each arch subdir of those
+ # specified as compatible for the current machine.
+ # NOTE: Development-helper feature, NOT a full-fledged feed.
+ if [ -n "${FEED_DEPLOYDIR_BASE_URI}" ]; then
+ for arch in ${PACKAGE_ARCHS}
+ do
+ echo "src/gz local-$arch ${FEED_DEPLOYDIR_BASE_URI}/$arch" >> ${IMAGE_ROOTFS}/etc/opkg/local-$arch-feed.conf
+ done
+ fi
}
python () {
--
1.7.6.4
^ permalink raw reply related [flat|nested] 23+ messages in thread* [CONSOLIDATED PULL 02/17] image_types.bbclass: implement jffs2 summary images (sum.jffs2)
2011-12-08 8:44 [CONSOLIDATED PULL 00/17] Master Fixes & Self-Hosted Fixes Saul Wold
2011-12-08 8:44 ` [CONSOLIDATED PULL 01/17] rootfs_ipk: implement FEED_DEPLOYDIR_BASE_URI support Saul Wold
@ 2011-12-08 8:44 ` Saul Wold
2011-12-08 8:44 ` [CONSOLIDATED PULL 03/17] image_types.bbclass: disable cleanmarkers for jffs2 images Saul Wold
` (15 subsequent siblings)
17 siblings, 0 replies; 23+ messages in thread
From: Saul Wold @ 2011-12-08 8:44 UTC (permalink / raw)
To: openembedded-core
From: Andrea Adami <andrea.adami@gmail.com>
* Building the jffs2 filesystem to include summary information speeds up
* the mount process considerably at the cost of increased size.
* The rate of speedup is generally higher on NAND chips and on the chips
* where the erase block size is large.
Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
---
meta/classes/image_types.bbclass | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 29b6380..bd4b7bc 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -35,6 +35,8 @@ XZ_COMPRESSION_LEVEL ?= "-e -9"
XZ_INTEGRITY_CHECK ?= "crc32"
IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}"
+IMAGE_CMD_sum.jffs2 = "${IMAGE_CMD_jffs2} && sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+ -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.sum.jffs2 ${EXTRA_IMAGECMD}"
IMAGE_CMD_cramfs = "mkcramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cramfs ${EXTRA_IMAGECMD}"
@@ -138,6 +140,7 @@ EXTRA_IMAGECMD_btrfs ?= ""
IMAGE_DEPENDS = ""
IMAGE_DEPENDS_jffs2 = "mtd-utils-native"
+IMAGE_DEPENDS_sum.jffs2 = "mtd-utils-native"
IMAGE_DEPENDS_cramfs = "cramfs-native"
IMAGE_DEPENDS_ext2 = "genext2fs-native"
IMAGE_DEPENDS_ext2.gz = "genext2fs-native"
@@ -157,4 +160,4 @@ IMAGE_DEPENDS_ubi = "mtd-utils-native"
IMAGE_DEPENDS_ubifs = "mtd-utils-native"
# This variable is available to request which values are suitable for IMAGE_FSTYPES
-IMAGE_TYPES = "jffs2 cramfs ext2 ext2.gz ext2.bz2 ext3 ext3.gz ext2.lzma live squashfs squashfs-lzma ubi tar tar.gz tar.bz2 tar.xz cpio cpio.gz cpio.xz cpio.lzma"
+IMAGE_TYPES = "jffs2 sum.jffs2 cramfs ext2 ext2.gz ext2.bz2 ext3 ext3.gz ext2.lzma live squashfs squashfs-lzma ubi tar tar.gz tar.bz2 tar.xz cpio cpio.gz cpio.xz cpio.lzma"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 23+ messages in thread* [CONSOLIDATED PULL 03/17] image_types.bbclass: disable cleanmarkers for jffs2 images
2011-12-08 8:44 [CONSOLIDATED PULL 00/17] Master Fixes & Self-Hosted Fixes Saul Wold
2011-12-08 8:44 ` [CONSOLIDATED PULL 01/17] rootfs_ipk: implement FEED_DEPLOYDIR_BASE_URI support Saul Wold
2011-12-08 8:44 ` [CONSOLIDATED PULL 02/17] image_types.bbclass: implement jffs2 summary images (sum.jffs2) Saul Wold
@ 2011-12-08 8:44 ` Saul Wold
2011-12-08 8:44 ` [CONSOLIDATED PULL 04/17] sysstat: don't run populate-volatile.sh update in do_rootfs or without populate-volatile.sh Saul Wold
` (14 subsequent siblings)
17 siblings, 0 replies; 23+ messages in thread
From: Saul Wold @ 2011-12-08 8:44 UTC (permalink / raw)
To: openembedded-core
From: Andrea Adami <andrea.adami@gmail.com>
* Add '-n' to suppress cleanmarker nodes since jffs2
* is usually used for NAND flash and the cleanmarkers are created in
* the OOB area by flash_eraseall -j
*
* From man pages: -n, --no-cleanmarkers
* Do not write cleanmarker nodes to the beginning of each erase block.
* This option can be useful for creating JFFS2 images for use on NAND flash,
* and for creating images which are to be used on a variety of hardware with differing eraseblock sizes.
Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
---
meta/classes/image_types.bbclass | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index bd4b7bc..489fbe1 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -34,9 +34,9 @@ runimagecmd () {
XZ_COMPRESSION_LEVEL ?= "-e -9"
XZ_INTEGRITY_CHECK ?= "crc32"
-IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}"
+IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 -n ${EXTRA_IMAGECMD}"
IMAGE_CMD_sum.jffs2 = "${IMAGE_CMD_jffs2} && sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
- -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.sum.jffs2 ${EXTRA_IMAGECMD}"
+ -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.sum.jffs2 -n ${EXTRA_IMAGECMD}"
IMAGE_CMD_cramfs = "mkcramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cramfs ${EXTRA_IMAGECMD}"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 23+ messages in thread* [CONSOLIDATED PULL 04/17] sysstat: don't run populate-volatile.sh update in do_rootfs or without populate-volatile.sh
2011-12-08 8:44 [CONSOLIDATED PULL 00/17] Master Fixes & Self-Hosted Fixes Saul Wold
` (2 preceding siblings ...)
2011-12-08 8:44 ` [CONSOLIDATED PULL 03/17] image_types.bbclass: disable cleanmarkers for jffs2 images Saul Wold
@ 2011-12-08 8:44 ` Saul Wold
2011-12-08 8:44 ` [CONSOLIDATED PULL 05/17] dpkg: Fix preinst execution Saul Wold
` (13 subsequent siblings)
17 siblings, 0 replies; 23+ messages in thread
From: Saul Wold @ 2011-12-08 8:44 UTC (permalink / raw)
To: openembedded-core
From: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-extended/sysstat/sysstat.inc | 7 ++++++-
meta/recipes-extended/sysstat/sysstat_10.0.3.bb | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-extended/sysstat/sysstat.inc b/meta/recipes-extended/sysstat/sysstat.inc
index 2936f96..ca40ab5 100644
--- a/meta/recipes-extended/sysstat/sysstat.inc
+++ b/meta/recipes-extended/sysstat/sysstat.inc
@@ -22,7 +22,12 @@ do_install() {
}
pkg_postinst_${PN} () {
- /etc/init.d/populate-volatile.sh update
+ if [ -n "$D" ]; then
+ exit 1
+ fi
+ if [ -e /etc/init.d/populate-volatile.sh ]; then
+ /etc/init.d/populate-volatile.sh update
+ fi
}
diff --git a/meta/recipes-extended/sysstat/sysstat_10.0.3.bb b/meta/recipes-extended/sysstat/sysstat_10.0.3.bb
index d445e88..7ef6c60 100644
--- a/meta/recipes-extended/sysstat/sysstat_10.0.3.bb
+++ b/meta/recipes-extended/sysstat/sysstat_10.0.3.bb
@@ -2,7 +2,7 @@ require sysstat.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
-PR = "r0"
+PR = "r1"
SRC_URI[md5sum] = "0e1ed5200f31f69a3b90ff1e81c07745"
SRC_URI[sha256sum] = "7c0dd172f09edaff100b33db29ef502e15e71867b505c6d519f76a24fabcc1f5"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 23+ messages in thread* [CONSOLIDATED PULL 05/17] dpkg: Fix preinst execution
2011-12-08 8:44 [CONSOLIDATED PULL 00/17] Master Fixes & Self-Hosted Fixes Saul Wold
` (3 preceding siblings ...)
2011-12-08 8:44 ` [CONSOLIDATED PULL 04/17] sysstat: don't run populate-volatile.sh update in do_rootfs or without populate-volatile.sh Saul Wold
@ 2011-12-08 8:44 ` Saul Wold
2011-12-08 8:44 ` [CONSOLIDATED PULL 06/17] dropbear: Upgrade from 0.53.1 to 2011.54 Saul Wold
` (12 subsequent siblings)
17 siblings, 0 replies; 23+ messages in thread
From: Saul Wold @ 2011-12-08 8:44 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Add a patch to fix exeuction of pre/post install scripts. See the patch
header for more details.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-devtools/dpkg/dpkg/preinst.patch | 46 +++++++++++++++++++++++++
meta/recipes-devtools/dpkg/dpkg_1.15.8.7.bb | 5 ++-
2 files changed, 49 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-devtools/dpkg/dpkg/preinst.patch
diff --git a/meta/recipes-devtools/dpkg/dpkg/preinst.patch b/meta/recipes-devtools/dpkg/dpkg/preinst.patch
new file mode 100644
index 0000000..06d2aac
--- /dev/null
+++ b/meta/recipes-devtools/dpkg/dpkg/preinst.patch
@@ -0,0 +1,46 @@
+Our pre/postinsts expect $D to be set when running in a sysroot and
+don't expect a chroot. This matches up our system expectations with
+what dpkg does.
+
+Upstream-Status: Inappropriate [OE Specific]
+
+RP 2011/12/07
+
+Index: dpkg-1.15.8.7/src/help.c
+===================================================================
+--- dpkg-1.15.8.7.orig/src/help.c 2010-12-20 01:25:36.000000000 +0000
++++ dpkg-1.15.8.7/src/help.c 2011-12-07 14:51:02.783461487 +0000
+@@ -181,30 +181,9 @@
+ * FIXME: none of the stuff here will work if admindir isn't inside
+ * instdir as expected.
+ */
+- size_t instdirl;
+-
+- if (*instdir) {
+- if (chroot(instdir)) ohshite(_("failed to chroot to `%.250s'"),instdir);
+- if (chdir("/"))
+- ohshite(_("failed to chdir to `%.255s'"), "/");
+- }
+- if (f_debug & dbg_scripts) {
+- struct varbuf args = VARBUF_INIT;
+- const char **argv = cmd->argv;
+-
+- while (*++argv) {
+- varbufaddc(&args, ' ');
+- varbufaddstr(&args, *argv);
+- }
+- varbufaddc(&args, '\0');
+- debug(dbg_scripts, "fork/exec %s (%s )", cmd->filename, args.buf);
+- varbuf_destroy(&args);
+- }
+- instdirl= strlen(instdir);
+- if (!instdirl)
+- return cmd->filename;
+- assert(strlen(cmd->filename) >= instdirl);
+- return cmd->filename + instdirl;
++ if (*instdir)
++ setenv("D", instdir, 1);
++ return cmd->filename;
+ }
+
+ void
diff --git a/meta/recipes-devtools/dpkg/dpkg_1.15.8.7.bb b/meta/recipes-devtools/dpkg/dpkg_1.15.8.7.bb
index f1a0eeb..f1030fa 100644
--- a/meta/recipes-devtools/dpkg/dpkg_1.15.8.7.bb
+++ b/meta/recipes-devtools/dpkg/dpkg_1.15.8.7.bb
@@ -4,10 +4,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
SRC_URI += "file://noman.patch \
file://check_snprintf.patch \
file://check_version.patch \
- file://perllibdir.patch"
+ file://perllibdir.patch \
+ file://preinst.patch"
SRC_URI[md5sum] = "d1731d4147c1ea3b537a4d094519a6dc"
SRC_URI[sha256sum] = "1ec1376471b04717a4497e5d7a27cd545248c92116898ce0c53ced8ea94267b5"
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.3"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 23+ messages in thread* [CONSOLIDATED PULL 06/17] dropbear: Upgrade from 0.53.1 to 2011.54
2011-12-08 8:44 [CONSOLIDATED PULL 00/17] Master Fixes & Self-Hosted Fixes Saul Wold
` (4 preceding siblings ...)
2011-12-08 8:44 ` [CONSOLIDATED PULL 05/17] dpkg: Fix preinst execution Saul Wold
@ 2011-12-08 8:44 ` Saul Wold
2011-12-08 8:44 ` [CONSOLIDATED PULL 07/17] distro_tracking_fields.inc: Update dropbear, iproute2, net-tools tracking information Saul Wold
` (11 subsequent siblings)
17 siblings, 0 replies; 23+ messages in thread
From: Saul Wold @ 2011-12-08 8:44 UTC (permalink / raw)
To: openembedded-core
From: Mei Lei <lei.mei@intel.com>
This new version added ALLOW_BLANK_PASSWORD option. So change the allow-nopw.patch content to enable this function.
Signed-off-by: Mei Lei <lei.mei@intel.com>
---
.../configure.patch | 0
.../dropbear/dropbear/allow-nopw.patch | 55 ++++++--------------
meta/recipes-core/dropbear/dropbear_0.53.1.bb | 6 --
meta/recipes-core/dropbear/dropbear_2011.54.bb | 6 ++
4 files changed, 23 insertions(+), 44 deletions(-)
rename meta/recipes-core/dropbear/{dropbear-0.53.1 => dropbear-2011.54}/configure.patch (100%)
delete mode 100644 meta/recipes-core/dropbear/dropbear_0.53.1.bb
create mode 100644 meta/recipes-core/dropbear/dropbear_2011.54.bb
diff --git a/meta/recipes-core/dropbear/dropbear-0.53.1/configure.patch b/meta/recipes-core/dropbear/dropbear-2011.54/configure.patch
similarity index 100%
rename from meta/recipes-core/dropbear/dropbear-0.53.1/configure.patch
rename to meta/recipes-core/dropbear/dropbear-2011.54/configure.patch
diff --git a/meta/recipes-core/dropbear/dropbear/allow-nopw.patch b/meta/recipes-core/dropbear/dropbear/allow-nopw.patch
index 3909ef2..a175ee1 100644
--- a/meta/recipes-core/dropbear/dropbear/allow-nopw.patch
+++ b/meta/recipes-core/dropbear/dropbear/allow-nopw.patch
@@ -1,40 +1,19 @@
-Upstream-Status: Inappropriate [embedded specific]
+Enable blank password login function for new release dropbear.
-diff --git a/svr-auth.c b/svr-auth.c
-index 87e3c5e..3e78c1a 100644
---- a/svr-auth.c
-+++ b/svr-auth.c
-@@ -250,6 +250,7 @@ static int checkusername(unsigned char *username, unsigned int userlen) {
- }
-
- /* check for an empty password */
-+#ifdef DISALLOW_EMPTY_PW
- if (ses.authstate.pw_passwd[0] == '\0') {
- TRACE(("leave checkusername: empty pword"))
- dropbear_log(LOG_WARNING, "User '%s' has blank password, rejected",
-@@ -257,6 +258,7 @@ static int checkusername(unsigned char *username, unsigned int userlen) {
- send_msg_userauth_failure(0, 1);
- return DROPBEAR_FAILURE;
- }
-+#endif
-
- TRACE(("shell is %s", ses.authstate.pw_shell))
-
-diff --git a/svr-authpasswd.c b/svr-authpasswd.c
-index a29fd63..6a3c7e9 100644
---- a/svr-authpasswd.c
-+++ b/svr-authpasswd.c
-@@ -64,9 +64,13 @@ void svr_auth_password() {
- * since the shadow password may differ to that tested
- * in auth.c */
- if (passwdcrypt[0] == '\0') {
-+#ifdef DISALLOW_EMPTY_PASSWD
- dropbear_log(LOG_WARNING, "User '%s' has blank password, rejected",
- ses.authstate.pw_name);
- send_msg_userauth_failure(0, 1);
-+#else
-+ send_msg_userauth_success();
-+#endif
- return;
- }
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Mei Lei <lei.mei@intel.com>
+
+diff --git a/options.h b/options.h
+index 73689ad..041ddaa 100644
+--- a/options.h
++++ b/options.h
+@@ -180,7 +180,7 @@ much traffic. */
+ * Public key logins are allowed for blank-password accounts regardless of this
+ * setting. PAM is not affected by this setting, it uses the normal pam.d
+ * settings ('nullok' option) */
+-/* #define ALLOW_BLANK_PASSWORD */
++#define ALLOW_BLANK_PASSWORD
+ #define ENABLE_CLI_PASSWORD_AUTH
+ #define ENABLE_CLI_PUBKEY_AUTH
diff --git a/meta/recipes-core/dropbear/dropbear_0.53.1.bb b/meta/recipes-core/dropbear/dropbear_0.53.1.bb
deleted file mode 100644
index 54f86e8..0000000
--- a/meta/recipes-core/dropbear/dropbear_0.53.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require dropbear.inc
-
-SRC_URI[md5sum] = "6b8d901859d9b8a18e2f6bfe0a892a03"
-SRC_URI[sha256sum] = "192538ca2a9ee778f12a2e8ddb6f098fa85dcb6457adc1cb40dd94b3c28f4df6"
-
-PR = "r0"
diff --git a/meta/recipes-core/dropbear/dropbear_2011.54.bb b/meta/recipes-core/dropbear/dropbear_2011.54.bb
new file mode 100644
index 0000000..b7b4b83
--- /dev/null
+++ b/meta/recipes-core/dropbear/dropbear_2011.54.bb
@@ -0,0 +1,6 @@
+require dropbear.inc
+
+SRC_URI[md5sum] = "ce1e236c4a8df0cb95253defee6716b5"
+SRC_URI[sha256sum] = "a5fe60fa9c11e7b0f6a21ef6e86a53ce3d55236548901905070ff1c1716fbf47"
+
+PR = "r0"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 23+ messages in thread* [CONSOLIDATED PULL 07/17] distro_tracking_fields.inc: Update dropbear, iproute2, net-tools tracking information.
2011-12-08 8:44 [CONSOLIDATED PULL 00/17] Master Fixes & Self-Hosted Fixes Saul Wold
` (5 preceding siblings ...)
2011-12-08 8:44 ` [CONSOLIDATED PULL 06/17] dropbear: Upgrade from 0.53.1 to 2011.54 Saul Wold
@ 2011-12-08 8:44 ` Saul Wold
2011-12-08 8:44 ` [CONSOLIDATED PULL 08/17] bitbake.conf/image.bbclass: Ensure images use the correct passwd/group files Saul Wold
` (10 subsequent siblings)
17 siblings, 0 replies; 23+ messages in thread
From: Saul Wold @ 2011-12-08 8:44 UTC (permalink / raw)
To: openembedded-core
From: Mei Lei <lei.mei@intel.com>
Signed-off-by: Mei Lei <lei.mei@intel.com>
---
.../conf/distro/include/distro_tracking_fields.inc | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index f53fffa..890340b 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -848,14 +848,15 @@ DISTRO_PN_ALIAS_pn-blktool = "Debian=blktool Mandriva=blktool"
RECIPE_STATUS_pn-iproute2 = "green"
RECIPE_DEPENDENCY_CHECK_pn-iproute2 = "not done"
-RECIPE_LATEST_VERSION_pn-iproute2 = "2.6.34"
+RECIPE_LATEST_VERSION_pn-iproute2 = "3.1.0"
RECIPE_PATCH_pn-iproute2+configure-cross = "to be pushed upstream"
RECIPE_INTEL_SECTION_pn-iproute2 = "base utils"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-iproute2 = "3 months"
-RECIPE_LATEST_RELEASE_DATE_pn-iproute2 = "May 01, 2010"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-iproute2 = "1 months"
+RECIPE_LATEST_RELEASE_DATE_pn-iproute2 = "Nov 17, 2011"
+RECIPE_NO_UPDATE_REASON_pn-iproute2="3.1.0 is the latest version, not 050607"
RECIPE_COMMENTS_pn-iproute2 = ""
DISTRO_PN_ALIAS_pn-iproute2 = "OSPDT"
-RECIPE_LAST_UPDATE_pn-iproute2 = "Nov 10, 2010"
+RECIPE_LAST_UPDATE_pn-iproute2 = "Nov 29, 2011"
RECIPE_MAINTAINER_pn-iproute2 = "Dongxiao Xu <dongxiao.xu@intel.com>"
RECIPE_STATUS_pn-netbase = "green"
@@ -1062,6 +1063,7 @@ RECIPE_MAINTAINER_pn-ethtool = "Zhai Edwin <edwin.zhai@intel.com>"
RECIPE_STATUS_pn-net-tools = "green"
RECIPE_LAST_UPDATE_pn-net-tools = "Aug 16, 2010"
RECIPE_LATEST_VERSION_pn-net-tools = "1.60-23"
+RECIPE_NO_UPDATE_REASON_pn-net-tools="1.60 is the latest version, 1.60-23 just its patch version"
RECIPE_MAINTAINER_pn-net-tools = "Dongxiao Xu <dongxiao.xu@intel.com>"
RECIPE_LATEST_VERSION_pn-net-tools = "1.60-23"
@@ -1608,10 +1610,10 @@ RECIPE_COMMENTS_pn-nfs-utils = ""
RECIPE_STATUS_pn-dropbear = "green"
DISTRO_PN_ALIAS_pn-dropbear = "Debian=dropbear Ubuntu=dropbear"
-RECIPE_LAST_UPDATE_pn-dropbear = "Sep 30, 2011"
+RECIPE_LAST_UPDATE_pn-dropbear = "Nov 29, 2011"
RECIPE_MAINTAINER_pn-dropbear = "Mei Lei <lei.mei@intel.com>"
RECIPE_DEPENDENCY_CHECK_pn-dropbear = "not done"
-RECIPE_LATEST_VERSION_pn-dropbear = "0.53.1"
+RECIPE_LATEST_VERSION_pn-dropbear = "2011.54"
RECIPE_PATCH_pn-dropbear+urandom-xauth-changes-to-options.h = "xauth path change"
RECIPE_PATCH_pn-dropbear+configure = "use configure cache value for cross compiling"
RECIPE_PATCH_pn-dropbear+fix-skb-keys = "enlarge key buffer size"
@@ -1619,10 +1621,9 @@ RECIPE_PATCH_pn-dropbear+allow-nopw = "allow login with no password, applied on
RECIPE_PATCH_pn-dropbear+init = "init script"
RECIPE_PATCH_pn-dropbear+dropbear-0.53.1-static_build_fix = "fix link error in 0.53.1 release"
RECIPE_INTEL_SECTION_pn-dropbear = "base utils"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-dropbear = "1 month"
-RECIPE_LATEST_RELEASE_DATE_pn-dropbear = "Mar 01, 2011"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-dropbear = "8 month"
+RECIPE_LATEST_RELEASE_DATE_pn-dropbear = "Nov 08, 2011"
RECIPE_COMMENTS_pn-dropbear = ""
-RECIPE_NO_UPDATE_REASON_pn-dropbear="0.53.1 is the latest version,not 0.255"
RECIPE_STATUS_pn-hal = "green"
RECIPE_LAST_UPDATE_pn-hal = "Jul 20, 2010"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 23+ messages in thread* [CONSOLIDATED PULL 08/17] bitbake.conf/image.bbclass: Ensure images use the correct passwd/group files
2011-12-08 8:44 [CONSOLIDATED PULL 00/17] Master Fixes & Self-Hosted Fixes Saul Wold
` (6 preceding siblings ...)
2011-12-08 8:44 ` [CONSOLIDATED PULL 07/17] distro_tracking_fields.inc: Update dropbear, iproute2, net-tools tracking information Saul Wold
@ 2011-12-08 8:44 ` Saul Wold
2011-12-08 8:44 ` [CONSOLIDATED PULL 09/17] qt4: fix debug symbol stripping Saul Wold
` (9 subsequent siblings)
17 siblings, 0 replies; 23+ messages in thread
From: Saul Wold @ 2011-12-08 8:44 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
We need pseudo to use the rootfs passwd/group files belonging to the
rootfs when building images. This patch ensures that we use the rootfs
files instead of those in the sysroot which can lead to incorrect file
ownership issues.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/classes/image.bbclass | 2 ++
meta/conf/bitbake.conf | 3 ++-
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 4642fa6..865d430 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -121,6 +121,8 @@ IMAGE_LINGUAS ?= "de-de fr-fr en-gb"
LINGUAS_INSTALL = "${@" ".join(map(lambda s: "locale-base-%s" % s, d.getVar('IMAGE_LINGUAS', 1).split()))}"
+PSEUDO_PASSWD = "${IMAGE_ROOTFS}"
+
do_rootfs[nostamp] = "1"
do_rootfs[dirs] = "${TOPDIR}"
do_rootfs[lockfiles] += "${IMAGE_ROOTFS}.lock"
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index e80cc32..eeb1fc4 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -580,11 +580,12 @@ SRC_URI = "file://${FILE}"
# Use pseudo as the fakeroot implementation
PSEUDO_LOCALSTATEDIR ?= "${WORKDIR}/pseudo/"
+PSEUDO_PASSWD ?= "${STAGING_DIR_TARGET}"
export PSEUDO_DISABLED = "1"
#export PSEUDO_PREFIX = "${STAGING_DIR_NATIVE}${prefix_native}"
#export PSEUDO_BINDIR = "${STAGING_DIR_NATIVE}${bindir_native}"
#export PSEUDO_LIBDIR = "${STAGING_DIR_NATIVE}$PSEUDOBINDIR/../lib/pseudo/lib
-FAKEROOTENV = "PSEUDO_PREFIX=${STAGING_DIR_NATIVE}${prefix_native} PSEUDO_LOCALSTATEDIR=${PSEUDO_LOCALSTATEDIR} PSEUDO_PASSWD=${STAGING_DIR_TARGET} PSEUDO_NOSYMLINKEXP=1 PSEUDO_DISABLED=0"
+FAKEROOTENV = "PSEUDO_PREFIX=${STAGING_DIR_NATIVE}${prefix_native} PSEUDO_LOCALSTATEDIR=${PSEUDO_LOCALSTATEDIR} PSEUDO_PASSWD=${PSEUDO_PASSWD} PSEUDO_NOSYMLINKEXP=1 PSEUDO_DISABLED=0"
FAKEROOTNOENV = "PSEUDO_UNLOAD=1"
FAKEROOTDIRS = "${PSEUDO_LOCALSTATEDIR}"
PREFERRED_PROVIDER_virtual/fakeroot-native ?= "pseudo-native"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 23+ messages in thread* [CONSOLIDATED PULL 09/17] qt4: fix debug symbol stripping
2011-12-08 8:44 [CONSOLIDATED PULL 00/17] Master Fixes & Self-Hosted Fixes Saul Wold
` (7 preceding siblings ...)
2011-12-08 8:44 ` [CONSOLIDATED PULL 08/17] bitbake.conf/image.bbclass: Ensure images use the correct passwd/group files Saul Wold
@ 2011-12-08 8:44 ` Saul Wold
2011-12-08 8:44 ` [CONSOLIDATED PULL 10/17] qt4: various tidy-ups Saul Wold
` (8 subsequent siblings)
17 siblings, 0 replies; 23+ messages in thread
From: Saul Wold @ 2011-12-08 8:44 UTC (permalink / raw)
To: openembedded-core
From: Paul Eggleton <paul.eggleton@linux.intel.com>
Adds a patch imported from Debian to not strip the executables as part
of the Qt build process. This fixes the warnings shown at packaging
stage as well as the content of the debug symbol packages.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
.../qt4/files/add_nostrip_for_debug_packages.diff | 23 ++++++++++++++++++++
meta/recipes-qt/qt4/qt-4.7.4.inc | 1 +
meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb | 2 +-
meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb | 2 +-
4 files changed, 26 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-qt/qt4/files/add_nostrip_for_debug_packages.diff
diff --git a/meta/recipes-qt/qt4/files/add_nostrip_for_debug_packages.diff b/meta/recipes-qt/qt4/files/add_nostrip_for_debug_packages.diff
new file mode 100644
index 0000000..774cb99
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/add_nostrip_for_debug_packages.diff
@@ -0,0 +1,23 @@
+author: Fathi Boudra <fabo@debian.org>
+
+Qt is built in release mode and strip files by default.
+Set CONFIG+=nostrip to avoid the stripping and
+let dh_strip do it to generate debug packages.
+
+Upstream-Status: Inappropriate [Configuration]
+
+---
+ configure | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/configure
++++ b/configure
+@@ -627,6 +627,8 @@ mkdir -p "$outpath/config.tests"
+ rm -f "$outpath/config.tests/.qmake.cache"
+ cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"
+
++QMakeVar add CONFIG nostrip
++
+ QMakeVar add styles "cde mac motif plastique cleanlooks windows"
+ QMakeVar add decorations "default windows styled"
+ QMakeVar add mouse-drivers "pc"
diff --git a/meta/recipes-qt/qt4/qt-4.7.4.inc b/meta/recipes-qt/qt4/qt-4.7.4.inc
index bc33b6b..7a3ba54 100644
--- a/meta/recipes-qt/qt4/qt-4.7.4.inc
+++ b/meta/recipes-qt/qt4/qt-4.7.4.inc
@@ -14,6 +14,7 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.
file://0001-Added-Openembedded-crossarch-option.patch \
file://blacklist-diginotar-certs.diff \
file://fix-translations.patch \
+ file://add_nostrip_for_debug_packages.diff \
file://g++.conf \
file://linux.conf \
file://fix-qtbug-20925.patch \
diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb b/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb
index e34ec8d..6b9f97a 100644
--- a/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb
+++ b/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb
@@ -1,7 +1,7 @@
require qt-${PV}.inc
require qt4-embedded.inc
-PR = "${INC_PR}.3"
+PR = "${INC_PR}.4"
QT_CONFIG_FLAGS_append_armv6-vfp = " -no-neon "
diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
index 8c48936..0db090f 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
+++ b/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
@@ -1,7 +1,7 @@
require qt4-x11-free.inc
require qt-${PV}.inc
-PR = "${INC_PR}.3"
+PR = "${INC_PR}.4"
QT_CONFIG_FLAGS_append_armv6-vfp = " -no-neon "
--
1.7.6.4
^ permalink raw reply related [flat|nested] 23+ messages in thread* [CONSOLIDATED PULL 10/17] qt4: various tidy-ups
2011-12-08 8:44 [CONSOLIDATED PULL 00/17] Master Fixes & Self-Hosted Fixes Saul Wold
` (8 preceding siblings ...)
2011-12-08 8:44 ` [CONSOLIDATED PULL 09/17] qt4: fix debug symbol stripping Saul Wold
@ 2011-12-08 8:44 ` Saul Wold
2011-12-08 8:44 ` [CONSOLIDATED PULL 11/17] initramfs-framework: provides a modular initramfs Saul Wold
` (7 subsequent siblings)
17 siblings, 0 replies; 23+ messages in thread
From: Saul Wold @ 2011-12-08 8:44 UTC (permalink / raw)
To: openembedded-core
From: Paul Eggleton <paul.eggleton@linux.intel.com>
* -reduce-relocations is already specified in qt4.inc, no need to add it
in qt-${PV}.inc
* Add QT_GLFLAGS to QT_CONFIG_FLAGS in qt4.inc rather than spreading it
through other inc files.
* Add "-xmlpatterns -no-rpath -qt3support -silent" to QT_CONFIG_FLAGS in
qt4.inc rather than qt-${PV}.inc; these have been supported since at
least 4.5.2 and therefore shouldn't be version-specific.
* Move "-no-fast -silent -no-rpath" to EXTRA_OECONF in qt4-native.inc
rather than the versioned recipes for the same reason
* Remove redundant setting of LICENSE in qt4-embedded.inc
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/recipes-qt/qt4/qt-4.7.4.inc | 3 ---
meta/recipes-qt/qt4/qt4-embedded.inc | 3 +--
meta/recipes-qt/qt4/qt4-native.inc | 3 ++-
meta/recipes-qt/qt4/qt4-native_4.7.4.bb | 2 --
meta/recipes-qt/qt4/qt4-x11-free.inc | 4 ++--
meta/recipes-qt/qt4/qt4.inc | 6 +++++-
6 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/meta/recipes-qt/qt4/qt-4.7.4.inc b/meta/recipes-qt/qt4/qt-4.7.4.inc
index 7a3ba54..8fda9ce 100644
--- a/meta/recipes-qt/qt4/qt-4.7.4.inc
+++ b/meta/recipes-qt/qt4/qt-4.7.4.inc
@@ -43,9 +43,6 @@ do_configure_prepend() {
${S}/configure
}
-QT_GLFLAGS ?= ""
-QT_CONFIG_FLAGS += " -xmlpatterns -no-rpath -qt3support -reduce-relocations -silent ${QT_GLFLAGS}"
-
do_compile() {
# Fixup missing wsegl header in some SGX SDKs
if ! [ -e ${STAGING_INCDIR}/wsegl.h ] ; then
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
index c4f6e98..06b2432 100644
--- a/meta/recipes-qt/qt4/qt4-embedded.inc
+++ b/meta/recipes-qt/qt4/qt4-embedded.inc
@@ -1,9 +1,8 @@
DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the embedded version."
SECTION = "libs"
-LICENSE = "LGPLv2.1 | GPLv3"
HOMEPAGE = "http://qt.nokia.com"
DEPENDS += "directfb tslib"
-INC_PR = "r37"
+INC_PR = "r38"
QT_BASE_NAME ?= "qt4-embedded"
QT_BASE_LIB ?= "libqt-embedded"
diff --git a/meta/recipes-qt/qt4/qt4-native.inc b/meta/recipes-qt/qt4/qt4-native.inc
index ebbee9b..8a6eb4b 100644
--- a/meta/recipes-qt/qt4/qt4-native.inc
+++ b/meta/recipes-qt/qt4/qt4-native.inc
@@ -31,7 +31,8 @@ EXTRA_OECONF = "-prefix ${prefix} \
-verbose -release \
-embedded -no-freetype -no-glib -no-iconv \
-exceptions -xmlpatterns \
- -qt3support"
+ -qt3support \
+ -no-fast -silent -no-rpath"
# yank default -e, otherwise we get the following error:
# moc_qbuffer.cpp: No such file or directory
diff --git a/meta/recipes-qt/qt4/qt4-native_4.7.4.bb b/meta/recipes-qt/qt4/qt4-native_4.7.4.bb
index 3be4d73..688fb50 100644
--- a/meta/recipes-qt/qt4/qt4-native_4.7.4.bb
+++ b/meta/recipes-qt/qt4/qt4-native_4.7.4.bb
@@ -8,8 +8,6 @@ SRC_URI += "file://blacklist-diginotar-certs.diff \
# Find the g++.conf/linux.conf in the right directory.
FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:"
-EXTRA_OECONF += " -no-fast -silent -no-rpath"
-
TOBUILD := "src/tools/bootstrap ${TOBUILD}"
SRC_URI[md5sum] = "9831cf1dfa8d0689a06c2c54c5c65aaf"
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 029c61e..53a44ad 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -5,12 +5,12 @@ HOMEPAGE = "http://qt.nokia.com"
SECTION = "x11/libs"
DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
-INC_PR = "r34"
+INC_PR = "r35"
QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
QT_GLFLAGS_qemux86 = "-opengl"
QT_GLFLAGS_qemuppc = "-opengl"
-QT_CONFIG_FLAGS += "-no-xinerama -no-xkb ${QT_GLFLAGS}"
+QT_CONFIG_FLAGS += "-no-xinerama -no-xkb"
QT_BASE_NAME ?= "qt4"
QT_BASE_LIB ?= "libqt"
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index bec81b4..3155cbb 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -11,12 +11,16 @@ QT_DISTRO_FLAGS_linuxstdbase = "-sm"
QT_SQL_DRIVER_FLAGS ?= "-no-sql-ibase -no-sql-mysql -no-sql-psql -no-sql-odbc -plugin-sql-sqlite"
+QT_GLFLAGS ?= ""
+
QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \
-shared -no-nas-sound -no-nis \
-qt-gif -system-libjpeg -system-libpng -system-zlib \
-no-pch -qdbus -stl -glib -phonon -webkit \
+ -xmlpatterns -no-rpath -qt3support -silent \
${QT_SQL_DRIVER_FLAGS} \
- ${QT_DISTRO_FLAGS} "
+ ${QT_DISTRO_FLAGS} \
+ ${QT_GLFLAGS}"
EXTRA_OEMAKE = "-e"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 23+ messages in thread* [CONSOLIDATED PULL 11/17] initramfs-framework: provides a modular initramfs
2011-12-08 8:44 [CONSOLIDATED PULL 00/17] Master Fixes & Self-Hosted Fixes Saul Wold
` (9 preceding siblings ...)
2011-12-08 8:44 ` [CONSOLIDATED PULL 10/17] qt4: various tidy-ups Saul Wold
@ 2011-12-08 8:44 ` Saul Wold
2011-12-08 8:44 ` [CONSOLIDATED PULL 12/17] grub: Create /etc/grub.d Saul Wold
` (6 subsequent siblings)
17 siblings, 0 replies; 23+ messages in thread
From: Saul Wold @ 2011-12-08 8:44 UTC (permalink / raw)
To: openembedded-core
From: Otavio Salvador <otavio@ossystems.com.br>
Provides the API and modules for a modular initramfs. The currently
included modules are:
* initramfs-module-debug adds support to dynamic debugging of
initramfs using bootparams
* initramfs-module-udev: enables udev usage
* initramfs-module-mdev: enables mdev usage
* initramfs-module-e2fs: adds support for ext4, ext3 and ext2
filesystems
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
.../initrdscripts/initramfs-framework/debug | 82 ++++++++++++
.../initrdscripts/initramfs-framework/e2fs | 28 ++++
.../initrdscripts/initramfs-framework/finish | 46 +++++++
.../initrdscripts/initramfs-framework/init | 136 ++++++++++++++++++++
.../initrdscripts/initramfs-framework/mdev | 30 +++++
.../initrdscripts/initramfs-framework/udev | 22 +++
.../initrdscripts/initramfs-framework_1.0.bb | 57 ++++++++
7 files changed, 401 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-core/initrdscripts/initramfs-framework/debug
create mode 100755 meta/recipes-core/initrdscripts/initramfs-framework/e2fs
create mode 100755 meta/recipes-core/initrdscripts/initramfs-framework/finish
create mode 100755 meta/recipes-core/initrdscripts/initramfs-framework/init
create mode 100644 meta/recipes-core/initrdscripts/initramfs-framework/mdev
create mode 100644 meta/recipes-core/initrdscripts/initramfs-framework/udev
create mode 100644 meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb
diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/debug b/meta/recipes-core/initrdscripts/initramfs-framework/debug
new file mode 100644
index 0000000..00bfd7d
--- /dev/null
+++ b/meta/recipes-core/initrdscripts/initramfs-framework/debug
@@ -0,0 +1,82 @@
+#!/bin/sh
+# Copyright (C) 2011 O.S. Systems Software LTDA.
+# Licensed on MIT
+
+# Adds support to dynamic debugging of initramfs using bootparam in
+# following format:
+# shell : starts a shell before and after each module
+# shell=before:<module> : starts a shell before <module> is loaded and run
+# shell=after:<module> : starts a shell after <module> is loaded and run
+#
+# shell-debug : run set -x as soon as possible
+# shell-debug=before:<module> : run set -x before <module> is loaded and run
+# shell-debug=after:<module> : run set -x after <module> is loaded and run
+
+DEBUG_SHELL="false"
+
+debug_hook_handler() {
+ status=$1
+ module=$2
+
+ if [ -n "$bootparam_shell" ] && [ "$bootparam_shell" != "true" ]; then
+ shell_wanted_status=`expr $bootparam_shell : '\(.*\):.*'`
+ shell_wanted_module=`expr $bootparam_shell : '.*:\(.*\)'`
+
+ if [ "$shell_wanted_status" = "before" ]; then
+ shell_wanted_status=pre
+ else
+ shell_wanted_status=post
+ fi
+ fi
+
+ if [ "$bootparam_shell" = "true" ] ||
+ ( [ "$status" = "$shell_wanted_status" ] &&
+ [ "$module" = "$shell_wanted_module" ] ); then
+ if [ "$status" = "pre" ]; then
+ status_msg="before"
+ else
+ status_msg="after"
+ fi
+
+ msg "Starting shell $status_msg $module..."
+ sh
+ fi
+
+ if [ -n "$bootparam_shell_debug" ] && [ "$bootparam_shell_debug" != "true" ]; then
+ shell_debug_wanted_status=`expr $bootparam_shell_debug : '\(.*\):.*'`
+ shell_debug_wanted_module=`expr $bootparam_shell_debug : '.*:\(.*\)'`
+
+ if [ "$shell_debug_wanted_status" = "before" ]; then
+ shell_debug_wanted_status=pre
+ else
+ shell_debug_wanted_status=post
+ fi
+ fi
+
+ if [ "$bootparam_shell_debug" = "true" ] ||
+ ( [ "$status" = "$shell_debug_wanted_status" ] &&
+ [ "$module" = "$shell_debug_wanted_module" ] ); then
+ if [ "$DEBUG_SHELL" = "true" ]; then
+ return 0
+ fi
+
+ if [ "$status" = "pre" ]; then
+ status_msg="before"
+ else
+ status_msg="after"
+ fi
+
+ msg "Starting shell debugging $status_msg $module..."
+ DEBUG_SHELL="true"
+ set -x
+ fi
+}
+
+debug_enabled() {
+ return 0
+}
+
+debug_run() {
+ add_module_pre_hook "debug_hook_handler"
+ add_module_post_hook "debug_hook_handler"
+}
diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/e2fs b/meta/recipes-core/initrdscripts/initramfs-framework/e2fs
new file mode 100755
index 0000000..29f801a
--- /dev/null
+++ b/meta/recipes-core/initrdscripts/initramfs-framework/e2fs
@@ -0,0 +1,28 @@
+#!/bin/sh
+# Copyright (C) 2011 O.S. Systems Software LTDA.
+# Licensed on MIT
+
+e2fs_enabled() {
+ return 0
+}
+
+e2fs_run() {
+ filesystems="ext4 ext3 ext2"
+
+ # load modules
+ for fs in $filesystems; do
+ load_kernel_module $fs
+ done
+
+ for fs in $filesystems; do
+ eval "fs_options=\$bootparam_${fs}"
+ if [ -n "$fs_options" ]; then
+ dev=`expr "$fs_options" : '\([^:]*\).*'`
+ path=`expr "$fs_options" : '[^:]*:\([^:]*\).*'`
+
+ info "Mounting $dev as $fs on $path as $fs..."
+ mkdir -p $path
+ mount -t $fs $dev $path
+ fi
+ done
+}
diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/finish b/meta/recipes-core/initrdscripts/initramfs-framework/finish
new file mode 100755
index 0000000..bedd803
--- /dev/null
+++ b/meta/recipes-core/initrdscripts/initramfs-framework/finish
@@ -0,0 +1,46 @@
+#!/bin/sh
+# Copyright (C) 2011 O.S. Systems Software LTDA.
+# Licensed on MIT
+
+finish_enabled() {
+ return 0
+}
+
+finish_run() {
+ if [ -n "$ROOTFS_DIR" ]; then
+ if [ -n "$bootparam_rootdelay" ]; then
+ debug "Sleeping for $rootdelay second(s) to wait root to settle..."
+ sleep $bootparam_rootdelay
+ fi
+
+ if [ -n "$bootparam_root" ]; then
+ debug "No e2fs compatible filesystem has been mounted, mounting $bootparam_root..."
+
+ if [ "${bootparam_root:0:5}" = "UUID=" ]; then
+ bootparam_root="/dev/disk/by-uuid/${bootparam_root/UUID=/}"
+ fi
+
+ if [ -e "$bootparam_root" ]; then
+ mount $bootparam_root $ROOTFS_DIR
+ else
+ debug "root '$bootparam_root' doesn't exist."
+ fi
+ fi
+
+ if [ ! -d $ROOTFS_DIR/dev ]; then
+ fatal "ERROR: There's no '/dev' on rootfs."
+ fi
+
+ info "Switching root to '$ROOTFS_DIR'..."
+
+ debug "Moving /dev, /proc and /sys onto rootfs..."
+ mount --move /dev $ROOTFS_DIR/dev
+ mount --move /proc $ROOTFS_DIR/proc
+ mount --move /sys $ROOTFS_DIR/sys
+
+ cd $ROOTFS_DIR
+ exec switch_root -c /dev/console $ROOTFS_DIR /sbin/init
+ else
+ debug "No rootfs has been set"
+ fi
+}
diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/init b/meta/recipes-core/initrdscripts/initramfs-framework/init
new file mode 100755
index 0000000..fc4b0db
--- /dev/null
+++ b/meta/recipes-core/initrdscripts/initramfs-framework/init
@@ -0,0 +1,136 @@
+#!/bin/sh
+# Copyright (C) 2011 O.S. Systems Software LTDA.
+# Licensed on MIT
+#
+# Provides the API to be used by the initramfs modules
+#
+# Modules need to provide the following functions:
+#
+# <module>_enabled : check if the module ought to run (return 1 to skip)
+# <module>_run : do what is need
+#
+# Boot parameters are available on environment in the as:
+#
+# 'foo=value' as 'bootparam_foo=value'
+# 'foo' as 'bootparam_foo=true'
+
+# Register a function to be called before running a module
+# The hook is called as:
+# <function> pre <module>
+add_module_pre_hook() {
+ MODULE_PRE_HOOKS="$MODULE_PRE_HOOKS $1"
+}
+
+# Register a function to be called after running a module
+# The hook is called as:
+# <function> post <module>
+add_module_post_hook() {
+ MODULE_POST_HOOKS="$MODULE_POST_HOOKS $1"
+}
+
+# Load kernel module
+load_kernel_module() {
+ if modprobe $1 >/dev/null 2>&1; then
+ info "Loaded module $1"
+ else
+ debug "Failed to load module $1"
+ fi
+}
+
+# Prints information
+msg() {
+ echo "$@" >/dev/console
+}
+
+# Prints information if verbose bootparam is used
+info() {
+ [ -n "$bootparam_verbose" ] && echo "$@" >/dev/console
+}
+
+# Prints information if debug bootparam is used
+debug() {
+ [ -n "$bootparam_debug" ] && echo "DEBUG: $@" >/dev/console
+}
+
+# Prints a message and start a endless loop
+fatal() {
+ echo $1 >/dev/console
+ echo >/dev/console
+
+ while [ "true" ]; do
+ sleep 3600
+ done
+}
+
+# Variables shared amoung modules
+ROOTFS_DIR="/rootfs" # where to do the switch root
+MODULE_PRE_HOOKS="" # functions to call before running each module
+MODULE_POST_HOOKS="" # functions to call after running each module
+MODULES_DIR=/init.d # place to look for modules
+
+# initialize /proc and /sys
+mkdir -p /proc /sys
+mount -t proc proc /proc
+mount -t sysfs sysfs /sys
+
+# populate bootparam environment
+for p in `cat /proc/cmdline`; do
+ opt="${p%%=*}"
+ opt=${opt/-/_}
+ if [ "${p/=/}" = "$p" ]; then
+ eval "bootparam_${opt}=true"
+ else
+ eval "bootparam_${opt}=\"${p#*=}\""
+ fi
+done
+
+# use /dev with devtmpfs
+if grep -q devtmpfs /proc/filesystems; then
+ mkdir -p /dev
+ mount -t devtmpfs devtmpfs /dev
+else
+ if [ ! -d /dev ]; then
+ fatal "ERROR: /dev doesn't exist and kernel doesn't has devtmpfs enabled."
+ fi
+fi
+
+mkdir $ROOTFS_DIR
+
+# Load and run modules
+for m in $MODULES_DIR/*; do
+ # Skip backup files
+ if [ "${m/\~/}" != "$m" ]; then
+ continue
+ fi
+
+ module=`basename $m | cut -d'-' -f 2`
+ debug "Loading module $module"
+
+ # pre hooks
+ for h in $MODULE_PRE_HOOKS; do
+ debug "Calling module hook (pre): $h"
+ eval "$h pre $module"
+ debug "Finished module hook (pre): $h"
+ done
+
+ # process module
+ source $m
+
+ if ! eval "${module}_enabled"; then
+ debug "Skipping module $module"
+ continue
+ fi
+
+ debug "Running ${module}_run"
+ eval "${module}_run"
+
+ # post hooks
+ for h in $MODULE_POST_HOOKS; do
+ debug "Calling module hook (post): $h"
+ eval "$h post $module"
+ debug "Finished module hook (post): $h"
+ done
+done
+
+# Catch all
+fatal "ERROR: Initramfs failed to initialize the system."
diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/mdev b/meta/recipes-core/initrdscripts/initramfs-framework/mdev
new file mode 100644
index 0000000..a5df1d7
--- /dev/null
+++ b/meta/recipes-core/initrdscripts/initramfs-framework/mdev
@@ -0,0 +1,30 @@
+#!/bin/sh
+# Copyright (C) 2011 O.S. Systems Software LTDA.
+# Licensed on MIT
+
+mdev_enabled() {
+ if [ ! -e /sbin/mdev ]; then
+ debug "/sbin/mdev doesn't exist"
+ return 1
+ fi
+
+ return 0
+}
+
+mdev_run() {
+ # setup the environment
+ mount -t tmpfs tmpfs /dev
+
+ mkdir -m 1777 /dev/shm
+
+ mkdir -m 0755 /dev/pts
+ mount -t devpts devpts /dev/pts
+
+ echo /sbin/mdev > /proc/sys/kernel/hotplug
+ mdev -s
+
+ # load modules for devices
+ find /sys -name modalias | while read m; do
+ load_kernel_module $(cat $m)
+ done
+}
diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/udev b/meta/recipes-core/initrdscripts/initramfs-framework/udev
new file mode 100644
index 0000000..9ea8aa3
--- /dev/null
+++ b/meta/recipes-core/initrdscripts/initramfs-framework/udev
@@ -0,0 +1,22 @@
+#!/bin/sh
+# Copyright (C) 2011 O.S. Systems Software LTDA.
+# Licensed on MIT
+
+udev_enabled() {
+ if [ ! -e /sbin/udevd ]; then
+ debug "/sbin/udev doesn't exist"
+ return 1
+ fi
+
+ return 0
+}
+
+udev_run() {
+ mkdir -p /run
+
+ udevd --daemon > /dev/null
+ udevadm trigger --action=add
+ udevadm settle
+
+ killall udevd 2>/dev/null
+}
diff --git a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb
new file mode 100644
index 0000000..58e41d4
--- /dev/null
+++ b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb
@@ -0,0 +1,57 @@
+DESCRIPTION = "initramfs modular system"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+RDEPENDS = "busybox"
+
+inherit allarch
+
+SRC_URI = "file://init \
+ file://finish \
+ file://mdev \
+ file://udev \
+ file://e2fs \
+ file://debug"
+
+do_install() {
+ install -d ${D}/init.d
+
+ # base
+ install -m 0755 ${WORKDIR}/init ${D}/init
+ install -m 0755 ${WORKDIR}/finish ${D}/init.d/99-finish
+
+ # mdev
+ install -m 0755 ${WORKDIR}/mdev ${D}/init.d/01-mdev
+
+ # udev
+ install -m 0755 ${WORKDIR}/udev ${D}/init.d/01-udev
+
+ # e2fs
+ install -m 0755 ${WORKDIR}/e2fs ${D}/init.d/10-e2fs
+
+ # debug
+ install -m 0755 ${WORKDIR}/debug ${D}/init.d/00-debug
+}
+
+PACKAGES = "${PN}-base \
+ initramfs-module-mdev \
+ initramfs-module-udev \
+ initramfs-module-e2fs \
+ initramfs-module-debug"
+
+FILES_${PN}-base = "/init /init.d/99-finish"
+
+DESCRIPTION_initramfs-module-mdev = "initramfs support for mdev"
+RDEPENDS_initramfs-module-mdev = "${PN}-base"
+FILES_initramfs-module-mdev = "/init.d/01-mdev"
+
+DESCRIPTION_initramfs-module-udev = "initramfs support for udev"
+RDEPENDS_initramfs-module-udev = "${PN}-base udev udev-utils"
+FILES_initramfs-module-udev = "/init.d/01-udev"
+
+DESCRIPTION_initramfs-module-e2fs = "initramfs support for ext4/ext3/ext2 filesystems"
+RDEPENDS_initramfs-module-e2fs = "${PN}-base"
+FILES_initramfs-module-e2fs = "/init.d/10-e2fs"
+
+DESCRIPTION_initramfs-module-debug = "initramfs dynamic debug support"
+RDEPENDS_initramfs-module-debug = "${PN}-base"
+FILES_initramfs-module-debug = "/init.d/00-debug"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 23+ messages in thread* [CONSOLIDATED PULL 12/17] grub: Create /etc/grub.d
2011-12-08 8:44 [CONSOLIDATED PULL 00/17] Master Fixes & Self-Hosted Fixes Saul Wold
` (10 preceding siblings ...)
2011-12-08 8:44 ` [CONSOLIDATED PULL 11/17] initramfs-framework: provides a modular initramfs Saul Wold
@ 2011-12-08 8:44 ` Saul Wold
2011-12-08 8:44 ` [CONSOLIDATED PULL 13/17] initrdscripts: add sleep to avoid kernel messages before install message Saul Wold
` (5 subsequent siblings)
17 siblings, 0 replies; 23+ messages in thread
From: Saul Wold @ 2011-12-08 8:44 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-bsp/grub/grub_1.99.bb | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-bsp/grub/grub_1.99.bb b/meta/recipes-bsp/grub/grub_1.99.bb
index 49c26f6..8fe2be8 100644
--- a/meta/recipes-bsp/grub/grub_1.99.bb
+++ b/meta/recipes-bsp/grub/grub_1.99.bb
@@ -13,7 +13,7 @@ LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
RDEPENDS_${PN} = "diffutils freetype"
-PR = "r2"
+PR = "r3"
SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \
file://grub-install.in.patch \
@@ -34,6 +34,7 @@ do_configure() {
}
do_install_append () {
+ install -d ${D}${sysconfdir}/grub.d
install -m 0755 ${WORKDIR}/40_custom ${D}${sysconfdir}/grub.d/40_custom
}
--
1.7.6.4
^ permalink raw reply related [flat|nested] 23+ messages in thread* [CONSOLIDATED PULL 13/17] initrdscripts: add sleep to avoid kernel messages before install message
2011-12-08 8:44 [CONSOLIDATED PULL 00/17] Master Fixes & Self-Hosted Fixes Saul Wold
` (11 preceding siblings ...)
2011-12-08 8:44 ` [CONSOLIDATED PULL 12/17] grub: Create /etc/grub.d Saul Wold
@ 2011-12-08 8:44 ` Saul Wold
2011-12-08 8:44 ` [CONSOLIDATED PULL 14/17] self-hosted-image: remove extra space since we use additional disk instead Saul Wold
` (4 subsequent siblings)
17 siblings, 0 replies; 23+ messages in thread
From: Saul Wold @ 2011-12-08 8:44 UTC (permalink / raw)
To: openembedded-core
As suggested by Darren Hart
[YOCTO #725]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../initrdscripts/files/init-install.sh | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh b/meta/recipes-core/initrdscripts/files/init-install.sh
index d31d994..90978dd 100644
--- a/meta/recipes-core/initrdscripts/files/init-install.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install.sh
@@ -23,6 +23,9 @@ for device in 'hda' 'hdb' 'sda' 'sdb'
found="yes"
while true; do
+ # Try sleeping here to avoid getting kernel messages
+ # obscuring/confusing user
+ sleep 5
echo "Found drive at /dev/${device}. Do you want to install this image there ? [y/n]"
read answer
if [ "$answer" = "y" ] ; then
--
1.7.6.4
^ permalink raw reply related [flat|nested] 23+ messages in thread* [CONSOLIDATED PULL 14/17] self-hosted-image: remove extra space since we use additional disk instead
2011-12-08 8:44 [CONSOLIDATED PULL 00/17] Master Fixes & Self-Hosted Fixes Saul Wold
` (12 preceding siblings ...)
2011-12-08 8:44 ` [CONSOLIDATED PULL 13/17] initrdscripts: add sleep to avoid kernel messages before install message Saul Wold
@ 2011-12-08 8:44 ` Saul Wold
2011-12-08 8:44 ` [CONSOLIDATED PULL 15/17] wget: enable https and openssl Saul Wold
` (3 subsequent siblings)
17 siblings, 0 replies; 23+ messages in thread
From: Saul Wold @ 2011-12-08 8:44 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-core/images/self-hosted-image.bb | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/images/self-hosted-image.bb b/meta/recipes-core/images/self-hosted-image.bb
index 7ddba9c..53bd989 100644
--- a/meta/recipes-core/images/self-hosted-image.bb
+++ b/meta/recipes-core/images/self-hosted-image.bb
@@ -4,8 +4,6 @@ POKY_EXTRA_INSTALL = "\
task-self-hosted \
"
-IMAGE_ROOTFS_EXTRA_SPACE = "1048576"
-
inherit core-image
-PR = "r0"
+PR = "r1"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 23+ messages in thread* [CONSOLIDATED PULL 15/17] wget: enable https and openssl
2011-12-08 8:44 [CONSOLIDATED PULL 00/17] Master Fixes & Self-Hosted Fixes Saul Wold
` (13 preceding siblings ...)
2011-12-08 8:44 ` [CONSOLIDATED PULL 14/17] self-hosted-image: remove extra space since we use additional disk instead Saul Wold
@ 2011-12-08 8:44 ` Saul Wold
2011-12-09 20:21 ` Khem Raj
2011-12-08 8:44 ` [CONSOLIDATED PULL 16/17] self-hosted: Add ext2 utilites and perl-pod for building Saul Wold
` (2 subsequent siblings)
17 siblings, 1 reply; 23+ messages in thread
From: Saul Wold @ 2011-12-08 8:44 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-extended/wget/wget.inc | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-extended/wget/wget.inc b/meta/recipes-extended/wget/wget.inc
index 91400cc..7083569 100644
--- a/meta/recipes-extended/wget/wget.inc
+++ b/meta/recipes-extended/wget/wget.inc
@@ -2,13 +2,13 @@ DESCRIPTION = "A console URL download utility featuring HTTP, FTP, and more."
SECTION = "console/network"
LICENSE = "GPL"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+DEPENDS = "openssl"
-INC_PR = "r11"
+INC_PR = "r12"
inherit autotools gettext update-alternatives
-# Disable checking for SSL since that searches the system paths
-EXTRA_OECONF = "--with-libc --enable-ipv6 --without-ssl"
+EXTRA_OECONF = "--with-libc --enable-ipv6 --with-ssl=openssl"
do_install_append () {
mv ${D}${bindir}/wget ${D}${bindir}/wget.${PN}
--
1.7.6.4
^ permalink raw reply related [flat|nested] 23+ messages in thread* Re: [CONSOLIDATED PULL 15/17] wget: enable https and openssl
2011-12-08 8:44 ` [CONSOLIDATED PULL 15/17] wget: enable https and openssl Saul Wold
@ 2011-12-09 20:21 ` Khem Raj
2011-12-19 4:12 ` Steve Sakoman
0 siblings, 1 reply; 23+ messages in thread
From: Khem Raj @ 2011-12-09 20:21 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: openembedded-core
On Thu, Dec 8, 2011 at 12:44 AM, Saul Wold <sgw@linux.intel.com> wrote:
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
> meta/recipes-extended/wget/wget.inc | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/meta/recipes-extended/wget/wget.inc b/meta/recipes-extended/wget/wget.inc
> index 91400cc..7083569 100644
> --- a/meta/recipes-extended/wget/wget.inc
> +++ b/meta/recipes-extended/wget/wget.inc
> @@ -2,13 +2,13 @@ DESCRIPTION = "A console URL download utility featuring HTTP, FTP, and more."
> SECTION = "console/network"
> LICENSE = "GPL"
> LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
> +DEPENDS = "openssl"
>
> -INC_PR = "r11"
> +INC_PR = "r12"
>
> inherit autotools gettext update-alternatives
>
> -# Disable checking for SSL since that searches the system paths
> -EXTRA_OECONF = "--with-libc --enable-ipv6 --without-ssl"
> +EXTRA_OECONF = "--with-libc --enable-ipv6 --with-ssl=openssl"
this deserves to be a configurable thing IMO
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [CONSOLIDATED PULL 15/17] wget: enable https and openssl
2011-12-09 20:21 ` Khem Raj
@ 2011-12-19 4:12 ` Steve Sakoman
2011-12-19 4:34 ` Cui, Dexuan
0 siblings, 1 reply; 23+ messages in thread
From: Steve Sakoman @ 2011-12-19 4:12 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Fri, Dec 9, 2011 at 12:21 PM, Khem Raj <raj.khem@gmail.com> wrote:
> On Thu, Dec 8, 2011 at 12:44 AM, Saul Wold <sgw@linux.intel.com> wrote:
>> Signed-off-by: Saul Wold <sgw@linux.intel.com>
>> ---
>> meta/recipes-extended/wget/wget.inc | 6 +++---
>> 1 files changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/meta/recipes-extended/wget/wget.inc b/meta/recipes-extended/wget/wget.inc
>> index 91400cc..7083569 100644
>> --- a/meta/recipes-extended/wget/wget.inc
>> +++ b/meta/recipes-extended/wget/wget.inc
>> @@ -2,13 +2,13 @@ DESCRIPTION = "A console URL download utility featuring HTTP, FTP, and more."
>> SECTION = "console/network"
>> LICENSE = "GPL"
>> LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
>> +DEPENDS = "openssl"
>>
>> -INC_PR = "r11"
>> +INC_PR = "r12"
>>
>> inherit autotools gettext update-alternatives
>>
>> -# Disable checking for SSL since that searches the system paths
>> -EXTRA_OECONF = "--with-libc --enable-ipv6 --without-ssl"
>> +EXTRA_OECONF = "--with-libc --enable-ipv6 --with-ssl=openssl"
>
> this deserves to be a configurable thing IMO
Agreed. Also, this seems to break the wget build for non x86 processors.
For example, on arm builds the config phase fails:
configure:30042: checking for libssl
configure:30072: ccache arm-poky-linux-gnueabi-gcc -march=armv7-a
-fno-tree-vectorize -mthumb-interwork -mfloat-abi=softfp
-mfpu=neon -mtune=cortex-a8
--sysroot=/media/Work/yocto-tmp/sysroots/omap3-multi -o conftest -O2
-pipe -g -feliminate-unused-debug-types -Wl,-O1 -Wl,--hash-style=gnu
-Wl,--as-needed conftest.c -ldl -lz -lssl -lcrypto /usr/lib/libz.so
>&5
/usr/lib/libz.so: could not read symbols: File in wrong format
Steve
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [CONSOLIDATED PULL 15/17] wget: enable https and openssl
2011-12-19 4:12 ` Steve Sakoman
@ 2011-12-19 4:34 ` Cui, Dexuan
0 siblings, 0 replies; 23+ messages in thread
From: Cui, Dexuan @ 2011-12-19 4:34 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Steve Sakoman wrote on 2011-12-19:
> On Fri, Dec 9, 2011 at 12:21 PM, Khem Raj <raj.khem@gmail.com> wrote:
>> On Thu, Dec 8, 2011 at 12:44 AM, Saul Wold <sgw@linux.intel.com>
> wrote:
>>> Signed-off-by: Saul Wold <sgw@linux.intel.com>
>>> ---
>>> meta/recipes-extended/wget/wget.inc | 6 +++---
>>> 1 files changed, 3 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/meta/recipes-extended/wget/wget.inc
>>> b/meta/recipes-extended/wget/wget.inc index 91400cc..7083569 100644
>>> --- a/meta/recipes-extended/wget/wget.inc +++
>>> b/meta/recipes-extended/wget/wget.inc @@ -2,13 +2,13 @@ DESCRIPTION =
>>> "A console URL download utility featuring HTTP, FTP, and more."
>>> SECTION = "console/network" LICENSE = "GPL" LIC_FILES_CHKSUM =
>>> "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" +DEPENDS =
>>> "openssl"
>>>
>>> -INC_PR = "r11"
>>> +INC_PR = "r12"
>>>
>>> inherit autotools gettext update-alternatives
>>>
>>> -# Disable checking for SSL since that searches the system paths
>>> -EXTRA_OECONF = "--with-libc --enable-ipv6 --without-ssl"
>>> +EXTRA_OECONF = "--with-libc --enable-ipv6 --with-ssl=openssl"
>>
>> this deserves to be a configurable thing IMO
>
> Agreed. Also, this seems to break the wget build for non x86 processors.
>
> For example, on arm builds the config phase fails:
>
> configure:30042: checking for libssl
> configure:30072: ccache arm-poky-linux-gnueabi-gcc -march=armv7-a
> -fno-tree-vectorize -mthumb-interwork -mfloat-abi=softfp
> -mfpu=neon -mtune=cortex-a8
> --sysroot=/media/Work/yocto-tmp/sysroots/omap3-multi -o conftest -O2
> -pipe -g -feliminate-unused-debug-types -Wl,-O1 -Wl,--hash-style=gnu
> -Wl,--as-needed conftest.c -ldl -lz -lssl -lcrypto /usr/lib/libz.so
>> &5
> /usr/lib/libz.so: could not read symbols: File in wrong format
Hi, Steve,
I found this issue, too.
I've made a patch for this and will send it out soon.
Thanks,
-- Dexuan
^ permalink raw reply [flat|nested] 23+ messages in thread
* [CONSOLIDATED PULL 16/17] self-hosted: Add ext2 utilites and perl-pod for building
2011-12-08 8:44 [CONSOLIDATED PULL 00/17] Master Fixes & Self-Hosted Fixes Saul Wold
` (14 preceding siblings ...)
2011-12-08 8:44 ` [CONSOLIDATED PULL 15/17] wget: enable https and openssl Saul Wold
@ 2011-12-08 8:44 ` Saul Wold
2011-12-08 8:44 ` [CONSOLIDATED PULL 17/17] ncurses: libcurses.so should link to libncurses.so Saul Wold
2011-12-08 15:27 ` [CONSOLIDATED PULL 00/17] Master Fixes & Self-Hosted Fixes Richard Purdie
17 siblings, 0 replies; 23+ messages in thread
From: Saul Wold @ 2011-12-08 8:44 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-core/tasks/task-self-hosted.bb | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-core/tasks/task-self-hosted.bb b/meta/recipes-core/tasks/task-self-hosted.bb
index b3a68b4..3247864 100644
--- a/meta/recipes-core/tasks/task-self-hosted.bb
+++ b/meta/recipes-core/tasks/task-self-hosted.bb
@@ -3,7 +3,7 @@
#
DESCRIPTION = "Create Basic Image Tasks"
-PR = "r1"
+PR = "r2"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
@@ -27,6 +27,8 @@ RDEPENDS_task-self-hosted = "\
# eglibc-utils: for rpcgen
RDEPENDS_task-self-hosted-sdk = "\
+ genext2fs \
+ e2fsprogs \
sed \
mktemp \
eglibc-utils \
@@ -111,6 +113,7 @@ RDEPENDS_task-self-hosted-extended = "\
perl \
perl-modules \
perl-dev \
+ perl-pod \
pth \
python \
python-compile \
--
1.7.6.4
^ permalink raw reply related [flat|nested] 23+ messages in thread* [CONSOLIDATED PULL 17/17] ncurses: libcurses.so should link to libncurses.so
2011-12-08 8:44 [CONSOLIDATED PULL 00/17] Master Fixes & Self-Hosted Fixes Saul Wold
` (15 preceding siblings ...)
2011-12-08 8:44 ` [CONSOLIDATED PULL 16/17] self-hosted: Add ext2 utilites and perl-pod for building Saul Wold
@ 2011-12-08 8:44 ` Saul Wold
2011-12-08 11:33 ` Phil Blundell
2011-12-08 15:27 ` [CONSOLIDATED PULL 00/17] Master Fixes & Self-Hosted Fixes Richard Purdie
17 siblings, 1 reply; 23+ messages in thread
From: Saul Wold @ 2011-12-08 8:44 UTC (permalink / raw)
To: openembedded-core
The current libcurses (backward compat) links to libncurses.so.5.9,
this causes a problem since this library also needs libtinfo, the
libncurses.so, uses a "ld script" to include both, libcurses.so
should point to libncurses.so (the script) not the library.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-core/ncurses/ncurses.inc | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
index df9252a..54876ca 100644
--- a/meta/recipes-core/ncurses/ncurses.inc
+++ b/meta/recipes-core/ncurses/ncurses.inc
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=cbc
SECTION = "libs"
DEPENDS = "ncurses-native"
DEPENDS_virtclass-native = ""
-INC_PR = "r2"
+INC_PR = "r3"
inherit autotools binconfig multilib_header
@@ -161,6 +161,10 @@ do_install() {
echo '/* GNU ld script */' >$f
echo "INPUT($i.so.5 AS_NEEDED(-ltinfo))" >>$f
done
+ # Make sure that libcurses is linked so that it gets -ltinfo
+ # also, this should be addressed upstream really.
+ rm -f ${D}${libdir}/libcurses.so
+ ln -s ${D}${libdir}/libncurses.so ${D}${libdir}/libcurses.so
# create libtermcap.so linker script for backward compatibility
f=${D}${libdir}/libtermcap.so
--
1.7.6.4
^ permalink raw reply related [flat|nested] 23+ messages in thread* Re: [CONSOLIDATED PULL 00/17] Master Fixes & Self-Hosted Fixes
2011-12-08 8:44 [CONSOLIDATED PULL 00/17] Master Fixes & Self-Hosted Fixes Saul Wold
` (16 preceding siblings ...)
2011-12-08 8:44 ` [CONSOLIDATED PULL 17/17] ncurses: libcurses.so should link to libncurses.so Saul Wold
@ 2011-12-08 15:27 ` Richard Purdie
17 siblings, 0 replies; 23+ messages in thread
From: Richard Purdie @ 2011-12-08 15:27 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: openembedded-core
On Thu, 2011-12-08 at 00:44 -0800, Saul Wold wrote:
> Andrea Adami (2):
> image_types.bbclass: implement jffs2 summary images (sum.jffs2)
> image_types.bbclass: disable cleanmarkers for jffs2 images
>
> Eric Bénard (1):
> rootfs_ipk: implement FEED_DEPLOYDIR_BASE_URI support
>
> Martin Jansa (1):
> sysstat: don't run populate-volatile.sh update in do_rootfs or
> without populate-volatile.sh
>
> Mei Lei (2):
> dropbear: Upgrade from 0.53.1 to 2011.54
> distro_tracking_fields.inc: Update dropbear,iproute2,net-tools
> tracking information.
>
> Otavio Salvador (1):
> initramfs-framework: provides a modular initramfs
>
> Paul Eggleton (2):
> qt4: fix debug symbol stripping
> qt4: various tidy-ups
>
> Richard Purdie (2):
> dpkg: Fix preinst execution
> bitbake.conf/image.bbclass: Ensure images use the correct
> passwd/group files
>
> Saul Wold (6):
> grub: Create /etc/grub.d
> initrdscripts: add sleep to avoid kernel messages before install
> message
> self-hosted-image: remove extra space since we use additional disk
> instead
> wget: enable https and openssl
I've taken the above although I did take v2 of the systate patch from
Martin and not the one in this series.
> self-hosted: Add ext2 utilites and perl-pod for building
This one doesn't look right to me. What ext2 utitilitis are we relying
upon during a build? They're not in ASSUME_PROVIDED...
> ncurses: libcurses.so should link to libncurses.so
Phil had some feedback on this, it doesn't look well tested.
Cheers,
Richard
^ permalink raw reply [flat|nested] 23+ messages in thread