[oe-commits] org.oe.dev merge of 'b7526fb97989513a85163a319269dac86b19a85c'
mickeyl commit
openembedded-commits at lists.openembedded.org
Sat Mar 1 00:51:00 UTC 2008
merge of 'b7526fb97989513a85163a319269dac86b19a85c'
and 'e0d71aa6a8738794986f1833521cdcb515df1ae7'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: ee048875cfe4eb10e9fae21dc07aaa545d4f29fc
ViewMTN: http://monotone.openembedded.org/revision/info/ee048875cfe4eb10e9fae21dc07aaa545d4f29fc
Files:
1
packages/glibc/files/glibc-2.5-local-dynamic-resolvconf.patch
packages/glibc/glibc_2.5.bb
packages/glibc/glibc_2.6.1.bb
packages/images/moko-underground-image.bb
packages/mtd/mtd-utils-native_1.1.0.bb
packages/mtd/mtd-utils_1.1.0.bb
packages/mtd/mtd-utils_1.0.0+git.bb
packages/u-boot/u-boot-openmoko-devel_git.bb
packages/u-boot/u-boot-openmoko_svn.bb
packages/util-linux-ng/util-linux-ng.inc
Diffs:
#
# mt diff -rb7526fb97989513a85163a319269dac86b19a85c -ree048875cfe4eb10e9fae21dc07aaa545d4f29fc
#
#
#
# patch "packages/glibc/files/glibc-2.5-local-dynamic-resolvconf.patch"
# from [63296cccc2b32cab961fcf4965eb86bd960f0213]
# to [9bdb7df2ad99ce5d483801d3b1869c601b18fc60]
#
# patch "packages/glibc/glibc_2.5.bb"
# from [53e27da951911e905482cc1827cbd661372ca6bd]
# to [4448b5d00d178de9e03d1a43d7c5803abbb93d2c]
#
# patch "packages/glibc/glibc_2.6.1.bb"
# from [a3edca56fd29b409cf9c2080cd7c5d19362a434c]
# to [5ed9c93ca660afcc61380030ee1d8c4340997ae3]
#
# patch "packages/images/moko-underground-image.bb"
# from [ad083e5de4d9af34be740450b02baa05b9066159]
# to [43f964983a74c8813baafb76633275a272d9eb4b]
#
============================================================
--- packages/glibc/files/glibc-2.5-local-dynamic-resolvconf.patch 63296cccc2b32cab961fcf4965eb86bd960f0213
+++ packages/glibc/files/glibc-2.5-local-dynamic-resolvconf.patch 9bdb7df2ad99ce5d483801d3b1869c601b18fc60
@@ -1,44 +1,41 @@
---- glibc-2.5.orig/debian/patches/any/local-dynamic-resolvconf.diff
-+++ glibc-2.5/debian/patches/any/local-dynamic-resolvconf.diff
-@@ -0,0 +1,41 @@
-+# All lines beginning with `# DP:' are a description of the patch.
-+# DP: Description: allow dynamic long-running processes to
-+# DP: re-read a dynamically updated resolv.conf on the fly
-+# DP: Dpatch author: Adam Conrad <adconrad at ubuntu.com>
-+# DP: Patch author: Thorsten Kukuk <kukuk at suse.de>
-+# DP: Upstream status: Ubuntu-Specific
-+# DP: Date: 2006-01-13 08:14:21 UTC
+# All lines beginning with `# DP:' are a description of the patch.
+# DP: Description: allow dynamic long-running processes to
+# DP: re-read a dynamically updated resolv.conf on the fly
+# DP: Dpatch author: Adam Conrad <adconrad at ubuntu.com>
+# DP: Patch author: Thorsten Kukuk <kukuk at suse.de>
+# DP: Upstream status: Ubuntu-Specific
+# DP: Date: 2006-01-13 08:14:21 UTC
+
+Index: resolv/res_libc.c
+===================================================================
+--- resolv/res_libc.c.orig
++++ resolv/res_libc.c
+@@ -22,7 +22,7 @@
+ #include <arpa/nameser.h>
+ #include <resolv.h>
+ #include <bits/libc-lock.h>
+-
++#include <sys/stat.h>
+
+ /* The following bit is copied from res_data.c (where it is #ifdef'ed
+ out) since res_init() should go into libc.so but the rest of that
+@@ -94,8 +94,17 @@
+ int
+ __res_maybe_init (res_state resp, int preinit)
+ {
+- if (resp->options & RES_INIT) {
+- if (__res_initstamp != resp->_u._ext.initstamp) {
++ static time_t last_mtime;
++ struct stat statbuf;
++ int ret;
+
++
++ if (resp->options & RES_INIT) {
++ ret = stat (_PATH_RESCONF, &statbuf);
++ if (__res_initstamp != resp->_u._ext.initstamp
++ || (ret == 0) && (last_mtime != statbuf.st_mtime))
++ {
++ last_mtime = statbuf.st_mtime;
+ if (resp->nscount > 0) {
+ __res_iclose (resp, true);
+ return __res_vinit (resp, 1);
-+Index: resolv/res_libc.c
-+===================================================================
-+--- resolv/res_libc.c.orig
-++++ resolv/res_libc.c
-+@@ -22,7 +22,7 @@
-+ #include <arpa/nameser.h>
-+ #include <resolv.h>
-+ #include <bits/libc-lock.h>
-+-
-++#include <sys/stat.h>
-+
-+ /* The following bit is copied from res_data.c (where it is #ifdef'ed
-+ out) since res_init() should go into libc.so but the rest of that
-+@@ -94,8 +94,17 @@
-+ int
-+ __res_maybe_init (res_state resp, int preinit)
-+ {
-+- if (resp->options & RES_INIT) {
-+- if (__res_initstamp != resp->_u._ext.initstamp) {
-++ static time_t last_mtime;
-++ struct stat statbuf;
-++ int ret;
-++
-++
-++ if (resp->options & RES_INIT) {
-++ ret = stat (_PATH_RESCONF, &statbuf);
-++ if (__res_initstamp != resp->_u._ext.initstamp
-++ || (ret == 0) && (last_mtime != statbuf.st_mtime))
-++ {
-++ last_mtime = statbuf.st_mtime;
-+ if (resp->nscount > 0) {
-+ __res_iclose (resp, true);
-+ return __res_vinit (resp, 1);
============================================================
--- packages/glibc/glibc_2.5.bb 53e27da951911e905482cc1827cbd661372ca6bd
+++ packages/glibc/glibc_2.5.bb 4448b5d00d178de9e03d1a43d7c5803abbb93d2c
@@ -1,5 +1,5 @@ require glibc.inc
require glibc.inc
-PR = "r9"
+PR = "r10"
ARM_INSTRUCTION_SET = "arm"
@@ -44,7 +44,7 @@ SRC_URI = "\
file://dl-cache-libcmp.patch;patch=1 \
file://ldsocache-varrun.patch;patch=1 \
file://nptl-crosscompile.patch;patch=1 \
- file://glibc-2.5-local-dynamic-resolvconf.patch;patch=1 \
+ file://glibc-2.5-local-dynamic-resolvconf.patch;patch=1;pnum=0 \
file://glibc-check_pf.patch;patch=1;pnum=0 \
file://zecke-sane-readelf.patch;patch=1 \
file://ldd-unbash.patch;patch=1 \
============================================================
--- packages/glibc/glibc_2.6.1.bb a3edca56fd29b409cf9c2080cd7c5d19362a434c
+++ packages/glibc/glibc_2.6.1.bb 5ed9c93ca660afcc61380030ee1d8c4340997ae3
@@ -1,5 +1,5 @@ require glibc.inc
require glibc.inc
-PR = "r2"
+PR = "r3"
ARM_INSTRUCTION_SET = "arm"
@@ -45,7 +45,7 @@ SRC_URI = "\
file://dl-cache-libcmp.patch;patch=1 \
file://ldsocache-varrun.patch;patch=1 \
file://nptl-crosscompile.patch;patch=1 \
- file://glibc-2.5-local-dynamic-resolvconf.patch;patch=1 \
+ file://glibc-2.5-local-dynamic-resolvconf.patch;patch=1;pnum=0 \
file://glibc-check_pf.patch;patch=1;pnum=0 \
file://zecke-sane-readelf.patch;patch=1 \
file://ldd-unbash.patch;patch=1 \
============================================================
--- packages/images/moko-underground-image.bb ad083e5de4d9af34be740450b02baa05b9066159
+++ packages/images/moko-underground-image.bb 43f964983a74c8813baafb76633275a272d9eb4b
@@ -5,7 +5,7 @@ ADD_INSTALL = "\
IMAGE_LINGUAS = ""
ADD_INSTALL = "\
- fontconfig \
+ fontconfig-utils \
\
ttf-dejavu-common \
ttf-dejavu-sans \
@@ -13,40 +13,22 @@ ADD_INSTALL = "\
\
"
+
IMAGE_INSTALL = "\
${MACHINE_TASK_PROVIDER} \
- task-base \
netbase \
sysfsutils \
- modutils-initscripts \
module-init-tools-depmod \
rsync \
screen \
fbset \
fbset-modes \
\
- matchbox-wm \
- ${XSERVER} \
- xserver-kdrive-common \
- xserver-nodm-init \
- xauth \
- xhost \
- xset \
- xrandr \
+ task-pyneo \
\
- gsm0710muxd \
- pyneod \
- pyneog \
- \
${ADD_INSTALL} \
"
-DEPENDS = "\
- ${MACHINE_TASK_PROVIDER} \
- task-pyneo \
-"
-
-
inherit image
ROOTFS_POSTPROCESS_COMMAND += 'date "+%m%d%H%M%Y" >${IMAGE_ROOTFS}/etc/timestamp'
#
# mt diff -re0d71aa6a8738794986f1833521cdcb515df1ae7 -ree048875cfe4eb10e9fae21dc07aaa545d4f29fc
#
#
#
# add_file "packages/mtd/mtd-utils-native_1.1.0.bb"
# content [dd47c646461b0cc50279ccce65777db75b47a5d8]
#
# add_file "packages/mtd/mtd-utils_1.1.0.bb"
# content [55322b9b44a9887ed3b3f6a0dc04916c921b45f7]
#
# patch "packages/mtd/mtd-utils_1.0.0+git.bb"
# from [db38f6e2d20f70fbb76af8a5fd01ade273c67858]
# to [7eddd005976dfff21ab5df1d7f4010a0cb36c45a]
#
# patch "packages/u-boot/u-boot-openmoko-devel_git.bb"
# from [0f2b626e154bed06468e377d158f71cb79956690]
# to [3f3b61ce6d5f6076fd65a8304d08f6a13b5c2719]
#
# patch "packages/u-boot/u-boot-openmoko_svn.bb"
# from [2feeb29fabb3786b6eea52cabe765729f2ab5568]
# to [ec3233f793ba92db77e3547d929b8b260e416b09]
#
# patch "packages/util-linux-ng/util-linux-ng.inc"
# from [3289f2865db0b2e423541c2ebf65db5ac8d5529e]
# to [b7c335928a65a41a8c98d632b9009e69898d7d11]
#
============================================================
--- packages/mtd/mtd-utils-native_1.1.0.bb dd47c646461b0cc50279ccce65777db75b47a5d8
+++ packages/mtd/mtd-utils-native_1.1.0.bb dd47c646461b0cc50279ccce65777db75b47a5d8
@@ -0,0 +1,5 @@
+# scheduled to enable 15-03-2008
+DEFAULT_PREFERENCE = "-1"
+
+require mtd-utils_${PV}.bb
+require mtd-utils-native.inc
============================================================
--- packages/mtd/mtd-utils_1.1.0.bb 55322b9b44a9887ed3b3f6a0dc04916c921b45f7
+++ packages/mtd/mtd-utils_1.1.0.bb 55322b9b44a9887ed3b3f6a0dc04916c921b45f7
@@ -0,0 +1,48 @@
+DESCRIPTION = "Tools for managing memory technology devices."
+SECTION = "base"
+DEPENDS = "zlib lzo"
+HOMEPAGE = "http://www.linux-mtd.infradead.org/"
+LICENSE = "GPLv2"
+PR = "r1"
+
+# scheduled to enable 15-03-2008
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-1.1.0.tar.bz2 \
+ file://add-exclusion-to-mkfs-jffs2-git.patch;patch=1 \
+ file://fix-ignoreerrors-git.patch;patch=1 \
+ file://lzo_1x.patch;patch=1"
+
+S = "${WORKDIR}/mtd-utils-${PV}/"
+
+EXTRA_OEMAKE = "'CC=${CC}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR'"
+
+do_stage () {
+ install -d ${STAGING_INCDIR}/mtd
+ for f in ${S}/include/mtd/*.h; do
+ install -m 0644 $f ${STAGING_INCDIR}/mtd/
+ done
+ for binary in ${mtd_utils}; do
+ install -m 0755 $binary ${STAGING_BINDIR}
+ done
+}
+
+mtd_utils = "ftl_format flash_erase flash_eraseall nanddump doc_loadbios \
+ mkfs.jffs ftl_check mkfs.jffs2 flash_lock flash_unlock flash_info mtd_debug \
+ flashcp nandwrite jffs2dump sumtool"
+
+do_install () {
+ install -d ${D}${bindir}
+ install -d ${D}${includedir}
+ for binary in ${mtd_utils}; do
+ install -m 0755 $binary ${D}${bindir}
+ done
+ for f in ${S}/include/mtd/*.h; do
+ install -m 0644 $f ${D}${includedir}
+ done
+}
+
+PACKAGES =+ "mkfs-jffs mkfs-jffs2"
+FILES_mkfs-jffs = "${bindir}/mkfs.jffs"
+FILES_mkfs-jffs2 = "${bindir}/mkfs.jffs2"
+
============================================================
--- packages/mtd/mtd-utils_1.0.0+git.bb db38f6e2d20f70fbb76af8a5fd01ade273c67858
+++ packages/mtd/mtd-utils_1.0.0+git.bb 7eddd005976dfff21ab5df1d7f4010a0cb36c45a
@@ -1,9 +1,9 @@ LICENSE = "GPLv2"
DESCRIPTION = "Tools for managing memory technology devices."
SECTION = "base"
DEPENDS = "zlib lzo"
HOMEPAGE = "http://www.linux-mtd.infradead.org/"
LICENSE = "GPLv2"
-PR = "r7"
+PR = "r8"
# This is the default package, thus we lock to a specific git version so
# upstream changes will not break builds.
@@ -36,11 +36,16 @@ do_install () {
do_install () {
install -d ${D}${bindir}
+ install -d ${D}${includedir}
for binary in ${mtd_utils}; do
install -m 0755 $binary ${D}${bindir}
done
+ for f in ${S}/include/mtd/*.h; do
+ install -m 0644 $f ${D}${includedir}
+ done
}
PACKAGES =+ "mkfs-jffs mkfs-jffs2"
FILES_mkfs-jffs = "${bindir}/mkfs.jffs"
FILES_mkfs-jffs2 = "${bindir}/mkfs.jffs2"
+
============================================================
--- packages/u-boot/u-boot-openmoko-devel_git.bb 0f2b626e154bed06468e377d158f71cb79956690
+++ packages/u-boot/u-boot-openmoko-devel_git.bb 3f3b61ce6d5f6076fd65a8304d08f6a13b5c2719
@@ -6,14 +6,16 @@ PV = "1.3.1${LOCALVERSION}"
PROVIDES = "virtual/bootloader"
LOCALVERSION = "+git${SRCREV}"
PV = "1.3.1${LOCALVERSION}"
-PR = "r0"
+PR = "r1"
-UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v1 gta02v2 gta02v3 gta02v4"
+UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v2 gta02v4 gta02v5"
DEFAULT_PREFERENCE = "-1"
SRCREV_FORMAT = "git.openmoko.org"
+SRCREV = "1dd080c17b105da5cd4720307fa62de38276796a"
+
SRC_URI = "git://git.openmoko.org/git/u-boot.git;protocol=git;branch=andy \
file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \
file://makefile-no-dirafter.patch;patch=1 \
============================================================
--- packages/u-boot/u-boot-openmoko_svn.bb 2feeb29fabb3786b6eea52cabe765729f2ab5568
+++ packages/u-boot/u-boot-openmoko_svn.bb ec3233f793ba92db77e3547d929b8b260e416b09
@@ -6,11 +6,11 @@ PV = "1.3.1${LOCALVERSION}"
PROVIDES = "virtual/bootloader"
LOCALVERSION = "+git${SRCDATE}+svnr${SRCREV}"
PV = "1.3.1${LOCALVERSION}"
-PR = "r0"
+PR = "r1"
SRCREV_FORMAT = "patches"
-UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v1 gta02v2 gta02v3 gta02v4"
+UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v2 gta02v4 gta02v5"
DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/util-linux-ng/util-linux-ng.inc 3289f2865db0b2e423541c2ebf65db5ac8d5529e
+++ packages/util-linux-ng/util-linux-ng.inc b7c335928a65a41a8c98d632b9009e69898d7d11
@@ -9,7 +9,8 @@ inherit autotools
# @todo Remove $RC later. See if patches are needed. Move files from /usr/*.
# -- Leon 'likewise' Woestenberg
-RC="-rc2"
+#RC="-rc2"
+RC=""
DEFAULT_PREFERENCE = "-1"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux-ng/v2.13/util-linux-ng-${PV}${RC}.tar.bz2"
More information about the Openembedded-commits
mailing list