[oe-commits] org.oe.angstrom-2007.12-stable merge of '188678fb3e33a2fb5504b393f8e8645f523739be'
pfalcon commit
openembedded-commits at lists.openembedded.org
Sat Feb 9 10:06:00 UTC 2008
merge of '188678fb3e33a2fb5504b393f8e8645f523739be'
and '51df778051e32582c31cf66a2e4eb8ad6906ae7d'
Author: pfalcon at openembedded.org
Branch: org.openembedded.angstrom-2007.12-stable
Revision: 6079fc05855a3b8f475a605a27a2d772e81fdd96
ViewMTN: http://monotone.openembedded.org/revision/info/6079fc05855a3b8f475a605a27a2d772e81fdd96
Files:
1
packages/glibc/files/glibc-2.5-local-dynamic-resolvconf.patch
BACKPORTS.txt
conf/distro/angstrom-2007.1.conf
packages/glibc/glibc_2.5.bb
packages/glibc/glibc_2.6.1.bb
packages/glibc/files/glibc-2.5-soft-fp-separate-strong-alias.patch
mtn:execute
contrib/angstrom/rss.php
contrib/angstrom/rss2.php
Diffs:
#
# mt diff -r188678fb3e33a2fb5504b393f8e8645f523739be -r6079fc05855a3b8f475a605a27a2d772e81fdd96
#
#
#
# add_file "packages/glibc/files/glibc-2.5-local-dynamic-resolvconf.patch"
# content [63296cccc2b32cab961fcf4965eb86bd960f0213]
#
# patch "BACKPORTS.txt"
# from [b0b1011fcb7a1fee9d9a7238384fb900be881faa]
# to [e2c4c9a7579a0f93647d96d4911c08e9d69d16e7]
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [69601316a679a24839064fa4f70f029c76e58bd8]
# to [4d26af58762b0c1236b665c7fdeeed26863d3fc3]
#
# patch "packages/glibc/glibc_2.5.bb"
# from [e6741570d99856aaaa4cd9d8b305974d4969b497]
# to [53e27da951911e905482cc1827cbd661372ca6bd]
#
# patch "packages/glibc/glibc_2.6.1.bb"
# from [1753994ceec7d4c54e81239f486d92052e46c752]
# to [1f216ad18c9a31af1594aec05b31fa975613897c]
#
# clear "packages/glibc/files/glibc-2.5-soft-fp-separate-strong-alias.patch"
# attr "mtn:execute"
#
============================================================
--- packages/glibc/files/glibc-2.5-local-dynamic-resolvconf.patch 63296cccc2b32cab961fcf4965eb86bd960f0213
+++ packages/glibc/files/glibc-2.5-local-dynamic-resolvconf.patch 63296cccc2b32cab961fcf4965eb86bd960f0213
@@ -0,0 +1,44 @@
+--- 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
++
++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);
============================================================
--- BACKPORTS.txt b0b1011fcb7a1fee9d9a7238384fb900be881faa
+++ BACKPORTS.txt e2c4c9a7579a0f93647d96d4911c08e9d69d16e7
@@ -78,5 +78,6 @@
02945aaeb0e67e273a58bf42b1a0a7988a413f92 cups tweak (Koen, PaulS)
4f0260db452e1d17accce2d4d5bdb2c928659a73 h5000.conf: Ship kernel-module-i2c-pxa. (PaulS, Koen)
647847c7187d536c71adab58568757d34b048ac2 h5000.conf: Ship BT module. (PaulS, Koen)
+013b42d9a596e92a85b2c13b49e8ce89c99c1b14 glibc fix (Koen, PaulS)
============================================================
--- conf/distro/angstrom-2007.1.conf 69601316a679a24839064fa4f70f029c76e58bd8
+++ conf/distro/angstrom-2007.1.conf 4d26af58762b0c1236b665c7fdeeed26863d3fc3
@@ -6,7 +6,7 @@
#@MAINTAINER: Michael 'Mickey' Lauer <mickey at Vanille.de>
#@--------------------------------------------------------------------
-DISTRO_VERSION = "2007.12-r3"
+DISTRO_VERSION = "2007.12-r4"
DISTRO_REVISION = "52"
require conf/distro/include/sane-srcdates.inc
============================================================
--- packages/glibc/glibc_2.5.bb e6741570d99856aaaa4cd9d8b305974d4969b497
+++ packages/glibc/glibc_2.5.bb 53e27da951911e905482cc1827cbd661372ca6bd
@@ -1,17 +1,15 @@ require glibc.inc
require glibc.inc
+PR = "r9"
ARM_INSTRUCTION_SET = "arm"
PACKAGES_DYNAMIC = "libc6*"
RPROVIDES_${PN}-dev = "libc6-dev"
-PR = "r8"
-
# the -isystem in bitbake.conf screws up glibc do_stage
BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
-
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4"
GLIBC_ADDONS ?= "ports,nptl,libidn"
@@ -36,57 +34,52 @@ RDEPENDS_${PN}-dev = "linux-libc-headers
RDEPENDS_${PN}-dev = "linux-libc-headers-dev"
-# file://noinfo.patch;patch=1
-# file://ldconfig.patch;patch=1;pnum=0
-# file://arm-machine-gmon.patch;patch=1;pnum=0 \
-# \
-# file://arm-ioperm.patch;patch=1;pnum=0 \
-# file://ldd.patch;patch=1;pnum=0 \
-SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \
- ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-${PV}.tar.bz2 \
- ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-${PV}.tar.bz2 \
- file://arm-memcpy.patch;patch=1 \
- file://arm-longlong.patch;patch=1 \
- file://fhs-linux-paths.patch;patch=1 \
- file://dl-cache-libcmp.patch;patch=1 \
- file://ldsocache-varrun.patch;patch=1 \
- file://nptl-crosscompile.patch;patch=1 \
- file://glibc-check_pf.patch;patch=1;pnum=0 \
-# file://glibc-2.4-compile.patch;patch=1 \
-# file://glibc-2.4-openat-3.patch;patch=1 \
-# file://fixup-aeabi-syscalls.patch;patch=1 \
- file://zecke-sane-readelf.patch;patch=1 \
- file://ldd-unbash.patch;patch=1 \
- file://generic-bits_select.h \
- file://generic-bits_types.h \
- file://generic-bits_typesizes.h \
- file://generic-bits_time.h \
- file://etc/ld.so.conf \
- file://generate-supported.mk"
+SRC_URI = "\
+ ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \
+ ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-${PV}.tar.bz2 \
+ ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-${PV}.tar.bz2 \
+ file://arm-memcpy.patch;patch=1 \
+ file://arm-longlong.patch;patch=1 \
+ file://fhs-linux-paths.patch;patch=1 \
+ 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-check_pf.patch;patch=1;pnum=0 \
+ file://zecke-sane-readelf.patch;patch=1 \
+ file://ldd-unbash.patch;patch=1 \
+ file://generic-bits_select.h \
+ file://generic-bits_types.h \
+ file://generic-bits_typesizes.h \
+ file://generic-bits_time.h \
+ file://etc/ld.so.conf \
+ file://generate-supported.mk \
+"
-
# Build fails on sh3 and sh4 without additional patches
SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1"
SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1"
-#powerpc patches to add support for soft-float
-SRC_URI_append_powerpc= " file://ppc-sfp-machine.patch;patch=1 \
- file://ppc-soft-fp-20070115.patch;patch=1 \
- file://ppc-ld-nofpu-20070104.patch;patch=1 \
- file://ppc-ports-ld-nofpu-20070114.patch;patch=1 \
- file://powerpc-sqrt-hack.diff;patch=1 \
- file://glibc-2.5-soft-fp-separate-strong-alias.patch;patch=1"
+# Powerpc patches to add support for soft-float
+SRC_URI_append_powerpc = " file://ppc-sfp-machine.patch;patch=1 \
+ file://ppc-soft-fp-20070115.patch;patch=1 \
+ file://ppc-ld-nofpu-20070104.patch;patch=1 \
+ file://ppc-ports-ld-nofpu-20070114.patch;patch=1 \
+ file://powerpc-sqrt-hack.diff;patch=1 \
+ file://glibc-2.5-soft-fp-separate-strong-alias.patch;patch=1"
S = "${WORKDIR}/glibc-${PV}"
B = "${WORKDIR}/build-${TARGET_SYS}"
-EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
- --without-cvs --disable-profile --disable-debug --without-gd \
- --enable-clocale=gnu \
- --enable-add-ons=${GLIBC_ADDONS} \
- --with-headers=${STAGING_INCDIR} \
- --without-selinux \
- ${GLIBC_EXTRA_OECONF}"
+EXTRA_OECONF = "\
+ --enable-kernel=${OLDEST_KERNEL} \
+ --without-cvs --disable-profile --disable-debug --without-gd \
+ --enable-clocale=gnu \
+ --enable-add-ons=${GLIBC_ADDONS} \
+ --with-headers=${STAGING_INCDIR} \
+ --without-selinux \
+ ${GLIBC_EXTRA_OECONF} \
+"
EXTRA_OECONF += "${@get_glibc_fpu_setting(bb, d)}"
============================================================
--- packages/glibc/glibc_2.6.1.bb 1753994ceec7d4c54e81239f486d92052e46c752
+++ packages/glibc/glibc_2.6.1.bb 1f216ad18c9a31af1594aec05b31fa975613897c
@@ -1,12 +1,11 @@ require glibc.inc
require glibc.inc
+PR = "r2"
ARM_INSTRUCTION_SET = "arm"
PACKAGES_DYNAMIC = "libc6*"
RPROVIDES_${PN}-dev = "libc6-dev"
-PR = "r1"
-
# the -isystem in bitbake.conf screws up glibc do_stage
BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
@@ -36,53 +35,47 @@ RDEPENDS_${PN}-dev = "linux-libc-headers
RDEPENDS_${PN}-dev = "linux-libc-headers-dev"
-# file://noinfo.patch;patch=1
-# file://ldconfig.patch;patch=1;pnum=0
-# file://arm-machine-gmon.patch;patch=1;pnum=0 \
-# \
-# file://arm-ioperm.patch;patch=1;pnum=0 \
-# file://ldd.patch;patch=1;pnum=0 \
-SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \
- ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-${PV}.tar.bz2 \
- ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-${PV}.tar.bz2 \
- file://arm-memcpy.patch;patch=1 \
- file://arm-longlong.patch;patch=1 \
- file://fhs-linux-paths.patch;patch=1 \
- file://dl-cache-libcmp.patch;patch=1 \
- file://ldsocache-varrun.patch;patch=1 \
- file://nptl-crosscompile.patch;patch=1 \
- file://glibc-check_pf.patch;patch=1;pnum=0 \
-# file://glibc-2.4-compile.patch;patch=1 \
-# file://glibc-2.4-openat-3.patch;patch=1 \
-# file://fixup-aeabi-syscalls.patch;patch=1 \
- file://zecke-sane-readelf.patch;patch=1 \
- file://ldd-unbash.patch;patch=1 \
- file://generic-bits_select.h \
- file://generic-bits_types.h \
- file://generic-bits_typesizes.h \
- file://generic-bits_time.h \
- file://etc/ld.so.conf \
- file://generate-supported.mk"
+SRC_URI = "\
+ ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \
+ ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-${PV}.tar.bz2 \
+ ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-${PV}.tar.bz2 \
+ file://arm-memcpy.patch;patch=1 \
+ file://arm-longlong.patch;patch=1 \
+ file://fhs-linux-paths.patch;patch=1 \
+ 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-check_pf.patch;patch=1;pnum=0 \
+ file://zecke-sane-readelf.patch;patch=1 \
+ file://ldd-unbash.patch;patch=1 \
+ file://generic-bits_select.h \
+ file://generic-bits_types.h \
+ file://generic-bits_typesizes.h \
+ file://generic-bits_time.h \
+ file://etc/ld.so.conf \
+ file://generate-supported.mk \
+"
-
# Build fails on sh3 and sh4 without additional patches
SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1"
SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1"
-#powerpc patches to add support for soft-float
-SRC_URI_append_powerpc= " \
- file://powerpc-sqrt-hack.diff;patch=1""
+# PowerPC Patches to add support for soft-float
+SRC_URI_append_powerpc = "file://powerpc-sqrt-hack.diff;patch=1"
S = "${WORKDIR}/glibc-${PV}"
B = "${WORKDIR}/build-${TARGET_SYS}"
-EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
- --without-cvs --disable-profile --disable-debug --without-gd \
- --enable-clocale=gnu \
- --enable-add-ons=${GLIBC_ADDONS} \
- --with-headers=${STAGING_INCDIR} \
- --without-selinux \
- ${GLIBC_EXTRA_OECONF}"
+EXTRA_OECONF = "\
+ --enable-kernel=${OLDEST_KERNEL} \
+ --without-cvs --disable-profile --disable-debug --without-gd \
+ --enable-clocale=gnu \
+ --enable-add-ons=${GLIBC_ADDONS} \
+ --with-headers=${STAGING_INCDIR} \
+ --without-selinux \
+ ${GLIBC_EXTRA_OECONF} \
+"
EXTRA_OECONF += "${@get_glibc_fpu_setting(bb, d)}"
#
# mt diff -r51df778051e32582c31cf66a2e4eb8ad6906ae7d -r6079fc05855a3b8f475a605a27a2d772e81fdd96
#
#
#
# delete "contrib/angstrom/rss.php"
#
# rename "contrib/angstrom/rss2.php"
# to "contrib/angstrom/rss.php"
#
# patch "contrib/angstrom/rss.php"
# from [30cfd581394ae7f5e17996503a966670e246c014]
# to [e7777fbd2d572c613ee592f6e59c2c79731ffca0]
#
============================================================
--- contrib/angstrom/rss2.php 30cfd581394ae7f5e17996503a966670e246c014
+++ contrib/angstrom/rss.php e7777fbd2d572c613ee592f6e59c2c79731ffca0
@@ -47,7 +47,7 @@ foreach($builder_log_date as $build)
$data = explode(' ', $build);
$rss_xml->startElement('item');
- $rss_xml->writeElement('title', "{$data[1]} ({$data[2]}) built for {$data[3]}");
+ $rss_xml->writeElement('title', "{$data[1]} ({$data[2]}) built for {$data[3]} (" . date('c', $data[0]) . ")");
$rss_xml->writeElement('link', "{$build_link_base}{$data[3]}/");
$rss_xml->writeElement('pubDate', date('r', $data[0]));
More information about the Openembedded-commits
mailing list