glibc-initial.inc: remove FILESPATHPKG setting to fix glibc-initial_2.3.2
PATCH 1/3 glibc-initial.inc: remove FILESPATHPKG setting to fix glibc-initial_2.3.2
All v2.5+ recipes add glibc-2.4 as a FILESDIR or FILESPATHPKG if they need it, so it's not required in the inc anymore.
Ref:
http://projects.linuxtogo.org/pipermail/openembedded-devel/2009-June/011692.html
Signed-off-by Michael Smith <[email protected]>
--- recipes/glibc/glibc-initial.inc | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
recipes/glibc/glibc-initial.inc +0 -1
@@ -1,7 +1,6 @@ SECTION = "libs" DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers" PROVIDES = "virtual/${TARGET_PREFIX}libc-initial" -FILESPATHPKG =. "glibc-2.4:" PACKAGES = "" PACKAGES_DYNAMIC = ""
Signature · 1 line
1.6.3
PATCH 2/3 glibc-stage.inc: don't overwrite gnu/stubs.h
"make install" installs the full version. do_stage() was overwriting it with an empty file that tricked openssh into calling setlogin() and logging benign errors.
Also removing a couple of lines not required anymore, I think because "make install-headers install-lib" was switched to "make install" in e96e82cd.
Tested with 2.6.1 on x86.
Signed-off-by Michael Smith <[email protected]>
--- recipes/glibc/glibc-stage.inc | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-)
recipes/glibc/glibc-stage.inc +4 -6
@@ -5,12 +5,10 @@ do_stage() { '${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6' \ install - install -d ${STAGING_INCDIR}/gnu \ - ${STAGING_INCDIR}/bits \ - ${STAGING_INCDIR}/rpcsvc - install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_INCDIR}/gnu/ - install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/ - install -m 0644 misc/syscall-list.h ${STAGING_INCDIR}/bits/syscall.h + # "make install" omits some (not all) RPC headers that other distros + # ship. + install -d ${STAGING_INCDIR}/rpcsvc + for r in ${rpcsvc}; do h=`echo $r|sed -e's,\.x$,.h,'` install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/
Signature · 1 line
1.6.3
PATCH 3/3 glibc: use INC_PR, bumping all PRs to r32.0
Signed-off-by Michael Smith <[email protected]>
--- recipes/glibc/glibc.inc | 3 +++ recipes/glibc/glibc_2.2.5.bb | 2 +- recipes/glibc/glibc_2.3.2+cvs20040726.bb | 2 +- recipes/glibc/glibc_2.3.2.bb | 2 +- recipes/glibc/glibc_2.3.3+cvs20041128.bb | 2 +- recipes/glibc/glibc_2.3.3+cvs20050221.bb | 2 +- recipes/glibc/glibc_2.3.3+cvs20050420.bb | 2 +- recipes/glibc/glibc_2.3.3.bb | 2 +- recipes/glibc/glibc_2.3.5+cvs20050627.bb | 2 +- recipes/glibc/glibc_2.3.6.bb | 2 +- recipes/glibc/glibc_2.4.bb | 2 +- recipes/glibc/glibc_2.5.bb | 2 +- recipes/glibc/glibc_2.6.1.bb | 2 +- recipes/glibc/glibc_2.7.bb | 2 +- recipes/glibc/glibc_2.9.bb | 2 +- recipes/glibc/glibc_cvs.bb | 2 +- 16 files changed, 18 insertions(+), 15 deletions(-)
recipes/glibc/glibc.inc +3 -0
@@ -10,6 +10,9 @@ DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers" PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" PROVIDES += "virtual/libintl virtual/libiconv" +# INC_PR for glibc.inc, glibc-initial.inc and glibc-stage.inc +INC_PR = "r32" + inherit autotools LEAD_SONAME = "libc.so"
recipes/glibc/glibc_2.2.5.bb +1 -1
@@ -1,7 +1,7 @@ require glibc.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r21" +PR = "${INC_PR}.0" DEFAULT_PREFERENCE_sh3 = "-99"
recipes/glibc/glibc_2.3.2+cvs20040726.bb +1 -1
@@ -3,7 +3,7 @@ require glibc.inc DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r31" +PR = "${INC_PR}.0" GLIBC_ADDONS ?= "linuxthreads"
recipes/glibc/glibc_2.3.2.bb +1 -1
@@ -1,6 +1,6 @@ require glibc.inc -PR = "r20" +PR = "${INC_PR}.0" DEFAULT_PREFERENCE_sh3 = "-99"
recipes/glibc/glibc_2.3.3+cvs20041128.bb +1 -1
@@ -3,7 +3,7 @@ require glibc.inc DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r16" +PR = "${INC_PR}.0" GLIBC_ADDONS ?= "linuxthreads"
recipes/glibc/glibc_2.3.3+cvs20050221.bb +1 -1
@@ -3,7 +3,7 @@ require glibc.inc DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r16" +PR = "${INC_PR}.0" GLIBC_ADDONS ?= "linuxthreads"
recipes/glibc/glibc_2.3.3+cvs20050420.bb +1 -1
@@ -5,7 +5,7 @@ DEFAULT_PREFERENCE_i586 = "0" DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r14" +PR = "${INC_PR}.0" GLIBC_ADDONS ?= "linuxthreads"
recipes/glibc/glibc_2.3.3.bb +1 -1
@@ -1,6 +1,6 @@ require glibc.inc -PR = "r17" +PR = "${INC_PR}.0" DEFAULT_PREFERENCE_sh3 = "-99"
recipes/glibc/glibc_2.3.5+cvs20050627.bb +1 -1
@@ -2,7 +2,7 @@ require glibc.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5" SRCDATE = "20050627" -PR = "r23" +PR = "${INC_PR}.0" #Doesnt build for sh3 DEFAULT_PREFERENCE_sh3="-1"
recipes/glibc/glibc_2.3.6.bb +1 -1
@@ -1,6 +1,6 @@ require glibc.inc -PR = "r5" +PR = "${INC_PR}.0" GLIBC_ADDONS ?= "linuxthreads"
recipes/glibc/glibc_2.4.bb +1 -1
@@ -1,6 +1,6 @@ require glibc.inc -PR = "r21" +PR = "${INC_PR}.0" #add the hosts that are confirmed to be working to COMPATIBLE_HOSTi COMPATIBLE_HOST = '(i.86.*-linux|sh.*-linux)'
recipes/glibc/glibc_2.5.bb +1 -1
@@ -1,5 +1,5 @@ require glibc.inc -PR = "r18" +PR = "${INC_PR}.0" ARM_INSTRUCTION_SET = "arm"
recipes/glibc/glibc_2.6.1.bb +1 -1
@@ -1,5 +1,5 @@ require glibc.inc -PR = "r17" +PR = "${INC_PR}.0" PACKAGES_DYNAMIC = "libc6*" RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev"
recipes/glibc/glibc_2.7.bb +1 -1
@@ -5,7 +5,7 @@ ARM_INSTRUCTION_SET = "arm" PACKAGES_DYNAMIC = "libc6*" RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev" -PR = "r10" +PR = "${INC_PR}.0" # the -isystem in bitbake.conf screws up glibc do_stage BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
recipes/glibc/glibc_2.9.bb +1 -1
@@ -5,7 +5,7 @@ ARM_INSTRUCTION_SET = "arm" PACKAGES_DYNAMIC = "libc6*" RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev" -PR = "r1" +PR = "${INC_PR}.0" # the -isystem in bitbake.conf screws up glibc do_stage BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
recipes/glibc/glibc_cvs.bb +1 -1
@@ -1,7 +1,7 @@ require glibc.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5" -PR = "r12" +PR = "${INC_PR}.0" PV = "2.3.5+cvs${SRCDATE}" GLIBC_ADDONS ?= "ports,linuxthreads"
Signature · 1 line
1.6.3