* [PATCH V2 1/3] kernel.bbclass, module-base.bbclass: Use CC to form KERNEL_CC
@ 2012-09-12 5:59 Khem Raj
2012-09-12 5:59 ` [PATCH 2/3] runqemu: Explicitly specify MACHINE when calling bitbake Khem Raj
` (2 more replies)
0 siblings, 3 replies; 10+ messages in thread
From: Khem Raj @ 2012-09-12 5:59 UTC (permalink / raw)
To: openembedded-core
kernel compiler is not special and we currently have it so
we want to pass -march and -mtune options as CFLAGS to kernel
build so that compiler picks the right subarch flags when
compiling assembly files in particular. Otherwise defaults
are chosen which may not be right in many case e.g. when
compiling kernel for collie machine we should use arch=armv4
but it uses toolchain/as defaults which is armv5te
in some case e.g. thumb1 we know that kernel can not be compiled
in thumb1 mode so we can provide that information e.g. -marm
option through KERNEL_HOST_CC_ARCH variable as we do now
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/classes/kernel-arch.bbclass | 13 +++++++++++++
meta/classes/kernel.bbclass | 16 +---------------
meta/classes/module-base.bbclass | 16 ----------------
3 files changed, 14 insertions(+), 31 deletions(-)
diff --git a/meta/classes/kernel-arch.bbclass b/meta/classes/kernel-arch.bbclass
index 6446504..95a40f2 100644
--- a/meta/classes/kernel-arch.bbclass
+++ b/meta/classes/kernel-arch.bbclass
@@ -42,3 +42,16 @@ def map_uboot_arch(a, d):
export UBOOT_ARCH = "${@map_uboot_arch(d.getVar('ARCH', True), d)}"
+# Set TARGET_??_KERNEL_ARCH in the machine .conf to set architecture
+# specific options necessary for building the kernel and modules.
+TARGET_CC_KERNEL_ARCH ?= ""
+HOST_CC_KERNEL_ARCH ?= "${TARGET_CC_KERNEL_ARCH}"
+TARGET_LD_KERNEL_ARCH ?= ""
+HOST_LD_KERNEL_ARCH ?= "${TARGET_LD_KERNEL_ARCH}"
+TARGET_AR_KERNEL_ARCH ?= ""
+HOST_AR_KERNEL_ARCH ?= "${TARGET_AR_KERNEL_ARCH}"
+
+KERNEL_CC = "${CC} ${HOST_CC_KERNEL_ARCH}"
+KERNEL_LD = "${LD} ${HOST_LD_KERNEL_ARCH}"
+KERNEL_AR = "${AR} ${HOST_AR_KERNEL_ARCH}"
+
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index fdef1be..bcb6bd5 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -1,7 +1,7 @@
inherit linux-kernel-base module_strip
PROVIDES += "virtual/kernel"
-DEPENDS += "virtual/${TARGET_PREFIX}gcc kmod-native virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX} update-modules"
+DEPENDS += "virtual/${TARGET_PREFIX}gcc kmod-native update-modules"
# we include gcc above, we dont need virtual/libc
INHIBIT_DEFAULT_DEPS = "1"
@@ -37,20 +37,6 @@ KERNEL_PRIORITY ?= "${@int(d.getVar('PV',1).split('-')[0].split('+')[0].split('.
KERNEL_RELEASE ?= "${KERNEL_VERSION}"
-KERNEL_CCSUFFIX ?= ""
-KERNEL_LDSUFFIX ?= ""
-
-# Set TARGET_??_KERNEL_ARCH in the machine .conf to set architecture
-# specific options necessary for building the kernel and modules.
-#FIXME: should be this: TARGET_CC_KERNEL_ARCH ?= "${TARGET_CC_ARCH}"
-TARGET_CC_KERNEL_ARCH ?= ""
-HOST_CC_KERNEL_ARCH ?= "${TARGET_CC_KERNEL_ARCH}"
-TARGET_LD_KERNEL_ARCH ?= ""
-HOST_LD_KERNEL_ARCH ?= "${TARGET_LD_KERNEL_ARCH}"
-
-KERNEL_CC = "${CCACHE}${HOST_PREFIX}gcc${KERNEL_CCSUFFIX} ${HOST_CC_KERNEL_ARCH}${TOOLCHAIN_OPTIONS}"
-KERNEL_LD = "${HOST_PREFIX}ld${KERNEL_LDSUFFIX} ${HOST_LD_KERNEL_ARCH}${TOOLCHAIN_OPTIONS}"
-
# Where built kernel lies in the kernel tree
KERNEL_OUTPUT ?= "arch/${ARCH}/boot/${KERNEL_IMAGETYPE}"
KERNEL_IMAGEDEST = "boot"
diff --git a/meta/classes/module-base.bbclass b/meta/classes/module-base.bbclass
index 9379bf8..f4ec2d4 100644
--- a/meta/classes/module-base.bbclass
+++ b/meta/classes/module-base.bbclass
@@ -7,22 +7,6 @@ export CROSS_COMPILE = "${TARGET_PREFIX}"
export KERNEL_VERSION = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion')}"
KERNEL_OBJECT_SUFFIX = ".ko"
-KERNEL_CCSUFFIX = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-ccsuffix')}"
-KERNEL_LDSUFFIX = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-ldsuffix')}"
-KERNEL_ARSUFFIX = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-arsuffix')}"
-
-# Set TARGET_??_KERNEL_ARCH in the machine .conf to set architecture
-# specific options necessary for building the kernel and modules.
-TARGET_CC_KERNEL_ARCH ?= ""
-HOST_CC_KERNEL_ARCH ?= "${TARGET_CC_KERNEL_ARCH}"
-TARGET_LD_KERNEL_ARCH ?= ""
-HOST_LD_KERNEL_ARCH ?= "${TARGET_LD_KERNEL_ARCH}"
-TARGET_AR_KERNEL_ARCH ?= ""
-HOST_AR_KERNEL_ARCH ?= "${TARGET_AR_KERNEL_ARCH}"
-
-KERNEL_CC = "${CCACHE}${HOST_PREFIX}gcc${KERNEL_CCSUFFIX} ${HOST_CC_KERNEL_ARCH}"
-KERNEL_LD = "${HOST_PREFIX}ld${KERNEL_LDSUFFIX} ${HOST_LD_KERNEL_ARCH}"
-KERNEL_AR = "${HOST_PREFIX}ar${KERNEL_ARSUFFIX} ${HOST_AR_KERNEL_ARCH}"
# kernel modules are generally machine specific
PACKAGE_ARCH = "${MACHINE_ARCH}"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 2/3] runqemu: Explicitly specify MACHINE when calling bitbake 2012-09-12 5:59 [PATCH V2 1/3] kernel.bbclass, module-base.bbclass: Use CC to form KERNEL_CC Khem Raj @ 2012-09-12 5:59 ` Khem Raj 2012-09-12 22:12 ` Scott Garman 2012-09-14 15:42 ` Saul Wold 2012-09-12 5:59 ` [PATCH 3/3] uclibc: Revert systemd regressing patch from upsteam uclibc Khem Raj 2012-09-12 6:32 ` [PATCH V2 1/3] kernel.bbclass, module-base.bbclass: Use CC to form KERNEL_CC Phil Blundell 2 siblings, 2 replies; 10+ messages in thread From: Khem Raj @ 2012-09-12 5:59 UTC (permalink / raw) To: openembedded-core When using runqemu with distros outside oe-core then MACHINE may not be there in local.conf so use the one thats available in environment of runqemu which is actually the correct one. Signed-off-by: Khem Raj <raj.khem@gmail.com> --- scripts/runqemu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/runqemu b/scripts/runqemu index a3c3509..e843946 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -281,7 +281,7 @@ setup_tmpdir() { exit 1; } # We have bitbake in PATH, get OE_TMPDIR from bitbake - OE_TMPDIR=`bitbake -e | grep ^TMPDIR=\" | cut -d '=' -f2 | cut -d '"' -f2` + OE_TMPDIR=`MACHINE=$MACHINE bitbake -e | grep ^TMPDIR=\" | cut -d '=' -f2 | cut -d '"' -f2` if [ -z "$OE_TMPDIR" ]; then echo "Error: this script needs to be run from your build directory," echo "or you need to explicitly set OE_TMPDIR in your environment" -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 2/3] runqemu: Explicitly specify MACHINE when calling bitbake 2012-09-12 5:59 ` [PATCH 2/3] runqemu: Explicitly specify MACHINE when calling bitbake Khem Raj @ 2012-09-12 22:12 ` Scott Garman 2012-09-14 15:42 ` Saul Wold 1 sibling, 0 replies; 10+ messages in thread From: Scott Garman @ 2012-09-12 22:12 UTC (permalink / raw) To: openembedded-core On 09/11/2012 10:59 PM, Khem Raj wrote: > When using runqemu with distros outside oe-core then > MACHINE may not be there in local.conf so use the one > thats available in environment of runqemu which is actually > the correct one. Looks simple enough. Acked-by: Scott Garman <scott.a.garman@intel.com> > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > --- > scripts/runqemu | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/scripts/runqemu b/scripts/runqemu > index a3c3509..e843946 100755 > --- a/scripts/runqemu > +++ b/scripts/runqemu > @@ -281,7 +281,7 @@ setup_tmpdir() { > exit 1; } > > # We have bitbake in PATH, get OE_TMPDIR from bitbake > - OE_TMPDIR=`bitbake -e | grep ^TMPDIR=\" | cut -d '=' -f2 | cut -d '"' -f2` > + OE_TMPDIR=`MACHINE=$MACHINE bitbake -e | grep ^TMPDIR=\" | cut -d '=' -f2 | cut -d '"' -f2` > if [ -z "$OE_TMPDIR" ]; then > echo "Error: this script needs to be run from your build directory," > echo "or you need to explicitly set OE_TMPDIR in your environment" > -- Scott Garman Embedded Linux Engineer - Yocto Project Intel Open Source Technology Center ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/3] runqemu: Explicitly specify MACHINE when calling bitbake 2012-09-12 5:59 ` [PATCH 2/3] runqemu: Explicitly specify MACHINE when calling bitbake Khem Raj 2012-09-12 22:12 ` Scott Garman @ 2012-09-14 15:42 ` Saul Wold 1 sibling, 0 replies; 10+ messages in thread From: Saul Wold @ 2012-09-14 15:42 UTC (permalink / raw) To: Khem Raj; +Cc: openembedded-core On 09/11/2012 10:59 PM, Khem Raj wrote: > When using runqemu with distros outside oe-core then > MACHINE may not be there in local.conf so use the one > thats available in environment of runqemu which is actually > the correct one. > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > --- > scripts/runqemu | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/scripts/runqemu b/scripts/runqemu > index a3c3509..e843946 100755 > --- a/scripts/runqemu > +++ b/scripts/runqemu > @@ -281,7 +281,7 @@ setup_tmpdir() { > exit 1; } > > # We have bitbake in PATH, get OE_TMPDIR from bitbake > - OE_TMPDIR=`bitbake -e | grep ^TMPDIR=\" | cut -d '=' -f2 | cut -d '"' -f2` > + OE_TMPDIR=`MACHINE=$MACHINE bitbake -e | grep ^TMPDIR=\" | cut -d '=' -f2 | cut -d '"' -f2` > if [ -z "$OE_TMPDIR" ]; then > echo "Error: this script needs to be run from your build directory," > echo "or you need to explicitly set OE_TMPDIR in your environment" > Merged into OE-Core Thanks Sau! ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 3/3] uclibc: Revert systemd regressing patch from upsteam uclibc 2012-09-12 5:59 [PATCH V2 1/3] kernel.bbclass, module-base.bbclass: Use CC to form KERNEL_CC Khem Raj 2012-09-12 5:59 ` [PATCH 2/3] runqemu: Explicitly specify MACHINE when calling bitbake Khem Raj @ 2012-09-12 5:59 ` Khem Raj 2012-09-12 6:37 ` Phil Blundell 2012-09-12 6:32 ` [PATCH V2 1/3] kernel.bbclass, module-base.bbclass: Use CC to form KERNEL_CC Phil Blundell 2 siblings, 1 reply; 10+ messages in thread From: Khem Raj @ 2012-09-12 5:59 UTC (permalink / raw) To: openembedded-core This patch is causing systemd based systemd to not boot Signed-off-by: Khem Raj <raj.khem@gmail.com> --- meta/recipes-core/uclibc/uclibc-git.inc | 5 +- ...nt.c-wtent.c-move-functions-from-utxent.c.patch | 321 ++++++++++++++++++++ 2 files changed, 324 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-core/uclibc/uclibc-git/0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch diff --git a/meta/recipes-core/uclibc/uclibc-git.inc b/meta/recipes-core/uclibc/uclibc-git.inc index eec4ded..4da9c58 100644 --- a/meta/recipes-core/uclibc/uclibc-git.inc +++ b/meta/recipes-core/uclibc/uclibc-git.inc @@ -1,9 +1,9 @@ -SRCREV="555ae2e88cd16a83f854634b6c3f35715b11d3d4" +SRCREV="cb43f2afba0633400387fa7c55dda3396517f58a" DEFAULT_PREFERENCE = "-1" PV = "0.9.33+git${SRCPV}" -PR = "${INC_PR}.3" +PR = "${INC_PR}.4" FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-git' ], d)}" @@ -26,5 +26,6 @@ SRC_URI = "git://uclibc.org/uClibc.git;branch=master;protocol=git \ file://0001-nptl-atfork-Hide-pthread_atfork-in-shared-versions.patch \ file://0001-librt-Use-nodefaultlibs-instead-of-nostdlib.patch \ file://mount.h-update.patch \ + file://0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch \ " S = "${WORKDIR}/git" diff --git a/meta/recipes-core/uclibc/uclibc-git/0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch b/meta/recipes-core/uclibc/uclibc-git/0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch new file mode 100644 index 0000000..8c202ac --- /dev/null +++ b/meta/recipes-core/uclibc/uclibc-git/0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch @@ -0,0 +1,321 @@ +Upstream-Status: Pending + +From 096abf14d2dc978607ccd8a0d7f42da65d8991f3 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 9 Sep 2012 22:00:04 -0700 +Subject: [PATCH] Revert "utent.c, wtent.c: move functions from utxent.c" + +This reverts commit 84135275cfeebc0b233c1c96eeada4d4178a0b18. +--- + include/utmp.h | 8 +++++ + libc/misc/utmp/utent.c | 80 +++++++++++------------------------------------ + libc/misc/utmp/utxent.c | 4 +-- + libc/misc/utmp/wtent.c | 14 ++------- + 4 files changed, 30 insertions(+), 76 deletions(-) + +diff --git a/include/utmp.h b/include/utmp.h +index cb8e08f..10b75c9 100644 +--- a/include/utmp.h ++++ b/include/utmp.h +@@ -57,29 +57,37 @@ extern void logwtmp (__const char *__ut_line, __const char *__ut_name, + /* Append entry UTMP to the wtmp-like file WTMP_FILE. */ + extern void updwtmp (__const char *__wtmp_file, __const struct utmp *__utmp) + __THROW; ++libc_hidden_proto(updwtmp) + + /* Change name of the utmp file to be examined. */ + extern int utmpname (__const char *__file) __THROW; ++libc_hidden_proto(utmpname) + + /* Read next entry from a utmp-like file. */ + extern struct utmp *getutent (void) __THROW; ++libc_hidden_proto(getutent) + + /* Reset the input stream to the beginning of the file. */ + extern void setutent (void) __THROW; ++libc_hidden_proto(setutent) + + /* Close the current open file. */ + extern void endutent (void) __THROW; ++libc_hidden_proto(endutent) + + /* Search forward from the current point in the utmp file until the + next entry with a ut_type matching ID->ut_type. */ + extern struct utmp *getutid (__const struct utmp *__id) __THROW; ++libc_hidden_proto(getutid) + + /* Search forward from the current point in the utmp file until the + next entry with a ut_line matching LINE->ut_line. */ + extern struct utmp *getutline (__const struct utmp *__line) __THROW; ++libc_hidden_proto(getutline) + + /* Write out entry pointed to by UTMP_PTR into the utmp file. */ + extern struct utmp *pututline (__const struct utmp *__utmp_ptr) __THROW; ++libc_hidden_proto(pututline) + + + #if 0 /* def __USE_MISC */ +diff --git a/libc/misc/utmp/utent.c b/libc/misc/utmp/utent.c +index a35bb2b..07ca44e 100644 +--- a/libc/misc/utmp/utent.c ++++ b/libc/misc/utmp/utent.c +@@ -19,9 +19,6 @@ + #include <errno.h> + #include <string.h> + #include <utmp.h> +-#ifdef __UCLIBC_HAS_UTMPX__ +-# include <utmpx.h> +-#endif + #include <not-cancel.h> + + #include <bits/uClibc_mutex.h> +@@ -34,7 +31,7 @@ static const char default_file_name[] = _PATH_UTMP; + static const char *static_ut_name = default_file_name; + + /* This function must be called with the LOCK held */ +-static void __setutent_unlocked(void) ++static void __setutent(void) + { + if (static_fd < 0) { + static_fd = open_not_cancel_2(static_ut_name, O_RDWR | O_CLOEXEC); +@@ -53,24 +50,19 @@ static void __setutent_unlocked(void) + lseek(static_fd, 0, SEEK_SET); + } + #if defined __UCLIBC_HAS_THREADS__ +-static void __setutent(void) ++void setutent(void) + { + __UCLIBC_MUTEX_LOCK(utmplock); +- __setutent_unlocked(); ++ __setutent(); + __UCLIBC_MUTEX_UNLOCK(utmplock); + } + #else +-static void __setutent(void); +-strong_alias(__setutent_unlocked,__setutent) +-#endif + strong_alias(__setutent,setutent) +- +-#ifdef __UCLIBC_HAS_UTMPX__ +-strong_alias(__setutent,setutxent) + #endif ++libc_hidden_def(setutent) + + /* This function must be called with the LOCK held */ +-static struct utmp *__getutent_unlocked(void) ++static struct utmp *__getutent(void) + { + if (static_fd < 0) { + __setutent(); +@@ -86,27 +78,19 @@ static struct utmp *__getutent_unlocked(void) + return NULL; + } + #if defined __UCLIBC_HAS_THREADS__ +-static struct utmp *__getutent(void) ++struct utmp *getutent(void) + { + struct utmp *ret; + + __UCLIBC_MUTEX_LOCK(utmplock); +- ret = __getutent_unlocked(); ++ ret = __getutent(); + __UCLIBC_MUTEX_UNLOCK(utmplock); + return ret; + } + #else +-static struct utmp *__getutent(void); +-strong_alias(__getutent_unlocked,__getutent) +-#endif + strong_alias(__getutent,getutent) +- +-#ifdef __UCLIBC_HAS_UTMPX__ +-struct utmpx *getutxent(void) +-{ +- return (struct utmpx *) __getutent (); +-} + #endif ++libc_hidden_def(getutent) + + static void __endutent(void) + { +@@ -117,13 +101,10 @@ static void __endutent(void) + __UCLIBC_MUTEX_UNLOCK(utmplock); + } + strong_alias(__endutent,endutent) +- +-#ifdef __UCLIBC_HAS_UTMPX__ +-strong_alias(__endutent,endutxent) +-#endif ++libc_hidden_def(endutent) + + /* This function must be called with the LOCK held */ +-static struct utmp *__getutid_unlocked(const struct utmp *utmp_entry) ++static struct utmp *__getutid(const struct utmp *utmp_entry) + { + struct utmp *lutmp; + unsigned type; +@@ -133,7 +114,7 @@ static struct utmp *__getutid_unlocked(const struct utmp *utmp_entry) + type = utmp_entry->ut_type - 1; + type /= 4; + +- while ((lutmp = __getutent_unlocked()) != NULL) { ++ while ((lutmp = __getutent()) != NULL) { + if (type == 0 && lutmp->ut_type == utmp_entry->ut_type) { + /* one of RUN_LVL, BOOT_TIME, NEW_TIME, OLD_TIME */ + return lutmp; +@@ -147,34 +128,26 @@ static struct utmp *__getutid_unlocked(const struct utmp *utmp_entry) + return NULL; + } + #if defined __UCLIBC_HAS_THREADS__ +-static struct utmp *__getutid(const struct utmp *utmp_entry) ++struct utmp *getutid(const struct utmp *utmp_entry) + { + struct utmp *ret; + + __UCLIBC_MUTEX_LOCK(utmplock); +- ret = __getutid_unlocked(utmp_entry); ++ ret = __getutid(utmp_entry); + __UCLIBC_MUTEX_UNLOCK(utmplock); + return ret; + } + #else +-static struct utmp *__getutid(const struct utmp *utmp_entry); +-strong_alias(__getutid_unlocked,__getutid) +-#endif + strong_alias(__getutid,getutid) +- +-#ifdef __UCLIBC_HAS_UTMPX__ +-struct utmpx *getutxid(const struct utmpx *utmp_entry) +-{ +- return (struct utmpx *) __getutid ((const struct utmp *) utmp_entry); +-} + #endif ++libc_hidden_def(getutid) + + static struct utmp *__getutline(const struct utmp *utmp_entry) + { + struct utmp *lutmp; + + __UCLIBC_MUTEX_LOCK(utmplock); +- while ((lutmp = __getutent_unlocked()) != NULL) { ++ while ((lutmp = __getutent()) != NULL) { + if (lutmp->ut_type == USER_PROCESS || lutmp->ut_type == LOGIN_PROCESS) { + if (strncmp(lutmp->ut_line, utmp_entry->ut_line, sizeof(lutmp->ut_line)) == 0) { + break; +@@ -185,13 +158,7 @@ static struct utmp *__getutline(const struct utmp *utmp_entry) + return lutmp; + } + strong_alias(__getutline,getutline) +- +-#ifdef __UCLIBC_HAS_UTMPX__ +-struct utmpx *getutxline(const struct utmpx *utmp_entry) +-{ +- return (struct utmpx *) __getutline ((const struct utmp *) utmp_entry); +-} +-#endif ++libc_hidden_def(getutline) + + static struct utmp *__pututline(const struct utmp *utmp_entry) + { +@@ -200,7 +167,7 @@ static struct utmp *__pututline(const struct utmp *utmp_entry) + the file pointer where they want it, everything will work out. */ + lseek(static_fd, (off_t) - sizeof(struct utmp), SEEK_CUR); + +- if (__getutid_unlocked(utmp_entry) != NULL) ++ if (__getutid(utmp_entry) != NULL) + lseek(static_fd, (off_t) - sizeof(struct utmp), SEEK_CUR); + else + lseek(static_fd, (off_t) 0, SEEK_END); +@@ -211,13 +178,7 @@ static struct utmp *__pututline(const struct utmp *utmp_entry) + return (struct utmp *)utmp_entry; + } + strong_alias(__pututline,pututline) +- +-#ifdef __UCLIBC_HAS_UTMPX__ +-struct utmpx *pututxline (const struct utmpx *utmp_entry) +-{ +- return (struct utmpx *) __pututline ((const struct utmp *) utmp_entry); +-} +-#endif ++libc_hidden_def(pututline) + + static int __utmpname(const char *new_ut_name) + { +@@ -241,7 +202,4 @@ static int __utmpname(const char *new_ut_name) + return 0; /* or maybe return -(static_ut_name != new_ut_name)? */ + } + strong_alias(__utmpname,utmpname) +- +-#ifdef __UCLIBC_HAS_UTMPX__ +-strong_alias(__utmpname,utmpxname) +-#endif ++libc_hidden_def(utmpname) +diff --git a/libc/misc/utmp/utxent.c b/libc/misc/utmp/utxent.c +index 71157cc..a0e80a6 100644 +--- a/libc/misc/utmp/utxent.c ++++ b/libc/misc/utmp/utxent.c +@@ -13,7 +13,6 @@ + #include <utmpx.h> + #include <utmp.h> + +-#if 0 /* moved to utent.c */ + void setutxent(void) + { + setutent (); +@@ -49,12 +48,10 @@ int utmpxname (const char *new_ut_name) + return utmpname (new_ut_name); + } + +-/* moved to wtent.c */ + void updwtmpx (const char *wtmpx_file, const struct utmpx *utmpx) + { + updwtmp (wtmpx_file, (const struct utmp *) utmpx); + } +-#endif + + /* Copy the information in UTMPX to UTMP. */ + void getutmp (const struct utmpx *utmpx, struct utmp *utmp) +@@ -107,3 +104,4 @@ void getutmpx (const struct utmp *utmp, struct utmpx *utmpx) + utmpx->ut_time = utmp->ut_time; + #endif + } ++ +diff --git a/libc/misc/utmp/wtent.c b/libc/misc/utmp/wtent.c +index 9b3ad50..b5e4ee5 100644 +--- a/libc/misc/utmp/wtent.c ++++ b/libc/misc/utmp/wtent.c +@@ -11,9 +11,6 @@ + #include <time.h> + #include <unistd.h> + #include <utmp.h> +-#ifdef __UCLIBC_HAS_UTMPX__ +-# include <utmpx.h> +-#endif + #include <fcntl.h> + #include <sys/file.h> + #include <not-cancel.h> +@@ -36,7 +33,7 @@ void logwtmp (const char *line, const char *name, const char *host) + } + #endif + +-static void __updwtmp(const char *wtmp_file, const struct utmp *lutmp) ++void updwtmp(const char *wtmp_file, const struct utmp *lutmp) + { + int fd; + +@@ -49,11 +46,4 @@ static void __updwtmp(const char *wtmp_file, const struct utmp *lutmp) + } + } + } +-strong_alias(__updwtmp,updwtmp) +- +-#ifdef __UCLIBC_HAS_UTMPX__ +-void updwtmpx (const char *wtmpx_file, const struct utmpx *utmpx) +-{ +- __updwtmp (wtmpx_file, (const struct utmp *) utmpx); +-} +-#endif ++libc_hidden_def(updwtmp) +-- +1.7.9.5 + -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 3/3] uclibc: Revert systemd regressing patch from upsteam uclibc 2012-09-12 5:59 ` [PATCH 3/3] uclibc: Revert systemd regressing patch from upsteam uclibc Khem Raj @ 2012-09-12 6:37 ` Phil Blundell 2012-09-12 7:53 ` Khem Raj 0 siblings, 1 reply; 10+ messages in thread From: Phil Blundell @ 2012-09-12 6:37 UTC (permalink / raw) To: Khem Raj; +Cc: openembedded-core On Tue, 2012-09-11 at 22:59 -0700, Khem Raj wrote: > This patch is causing systemd based systemd to not boot > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > --- > meta/recipes-core/uclibc/uclibc-git.inc | 5 +- > ...nt.c-wtent.c-move-functions-from-utxent.c.patch | 321 ++++++++++++++++++++ > 2 files changed, 324 insertions(+), 2 deletions(-) > create mode 100644 meta/recipes-core/uclibc/uclibc-git/0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch > > diff --git a/meta/recipes-core/uclibc/uclibc-git.inc b/meta/recipes-core/uclibc/uclibc-git.inc > index eec4ded..4da9c58 100644 > --- a/meta/recipes-core/uclibc/uclibc-git.inc > +++ b/meta/recipes-core/uclibc/uclibc-git.inc > @@ -1,9 +1,9 @@ > -SRCREV="555ae2e88cd16a83f854634b6c3f35715b11d3d4" > +SRCREV="cb43f2afba0633400387fa7c55dda3396517f58a" Why are you changing SRCREV as well? p. ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 3/3] uclibc: Revert systemd regressing patch from upsteam uclibc 2012-09-12 6:37 ` Phil Blundell @ 2012-09-12 7:53 ` Khem Raj 0 siblings, 0 replies; 10+ messages in thread From: Khem Raj @ 2012-09-12 7:53 UTC (permalink / raw) To: Phil Blundell; +Cc: openembedded-core On Tue, Sep 11, 2012 at 11:37 PM, Phil Blundell <philb@gnu.org> wrote: > Why are you changing SRCREV as well? Well I forgot to mention is in commit about SRCREV bump. I have tested the revert on top of the proposed SRCREV I will send a V2 with more details in commit log ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH V2 1/3] kernel.bbclass, module-base.bbclass: Use CC to form KERNEL_CC 2012-09-12 5:59 [PATCH V2 1/3] kernel.bbclass, module-base.bbclass: Use CC to form KERNEL_CC Khem Raj 2012-09-12 5:59 ` [PATCH 2/3] runqemu: Explicitly specify MACHINE when calling bitbake Khem Raj 2012-09-12 5:59 ` [PATCH 3/3] uclibc: Revert systemd regressing patch from upsteam uclibc Khem Raj @ 2012-09-12 6:32 ` Phil Blundell 2012-09-12 7:49 ` Khem Raj 2 siblings, 1 reply; 10+ messages in thread From: Phil Blundell @ 2012-09-12 6:32 UTC (permalink / raw) To: Khem Raj; +Cc: openembedded-core On Tue, 2012-09-11 at 22:59 -0700, Khem Raj wrote: > kernel compiler is not special and we currently have it so > we want to pass -march and -mtune options as CFLAGS to kernel > build so that compiler picks the right subarch flags when > compiling assembly files in particular. Historically, the kernel compiler has indeed been special: there have been some machines where, due to bugs in the kernel or the compiler or both, we need to use a different version of the compiler for the kernel than we use for userspace. The most famous example of this were the old ARM kernels back in the day which needed gcc-2.95 long after everyone else had stopped using it, but I think there might be a few cases where the same situation obtains even today. If you remove ${KERNEL_CCSUFFIX} then we will lose the ability to do that (easily). I'm not necessarily opposed to such a change but I think it does need to be justified with clear benefits. p. ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH V2 1/3] kernel.bbclass, module-base.bbclass: Use CC to form KERNEL_CC 2012-09-12 6:32 ` [PATCH V2 1/3] kernel.bbclass, module-base.bbclass: Use CC to form KERNEL_CC Phil Blundell @ 2012-09-12 7:49 ` Khem Raj 2012-09-13 18:02 ` Koen Kooi 0 siblings, 1 reply; 10+ messages in thread From: Khem Raj @ 2012-09-12 7:49 UTC (permalink / raw) To: Phil Blundell; +Cc: openembedded-core On Tue, Sep 11, 2012 at 11:32 PM, Phil Blundell <philb@gnu.org> wrote: > On Tue, 2012-09-11 at 22:59 -0700, Khem Raj wrote: >> kernel compiler is not special and we currently have it so >> we want to pass -march and -mtune options as CFLAGS to kernel >> build so that compiler picks the right subarch flags when >> compiling assembly files in particular. > > Historically, the kernel compiler has indeed been special: there have > been some machines where, due to bugs in the kernel or the compiler or > both, we need to use a different version of the compiler for the kernel > than we use for userspace. The most famous example of this were the old > ARM kernels back in the day which needed gcc-2.95 long after everyone > else had stopped using it, but I think there might be a few cases where > the same situation obtains even today. I agree with history but we have moved away from 2.9x for long. moreover v1 of this patch has been posted for weeks no one raised a concern which I take that such cases are not there anymore with OE-Core > > If you remove ${KERNEL_CCSUFFIX} then we will lose the ability to do > that (easily). I'm not necessarily opposed to such a change but I think > it does need to be justified with clear benefits. > again if there is a usecase with OE-Core of such a kind. I will be happy to deal with it no one has shown me one. > p. > > ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH V2 1/3] kernel.bbclass, module-base.bbclass: Use CC to form KERNEL_CC 2012-09-12 7:49 ` Khem Raj @ 2012-09-13 18:02 ` Koen Kooi 0 siblings, 0 replies; 10+ messages in thread From: Koen Kooi @ 2012-09-13 18:02 UTC (permalink / raw) To: Khem Raj; +Cc: Phil Blundell, openembedded-core Op 12 sep. 2012, om 09:49 heeft Khem Raj <raj.khem@gmail.com> het volgende geschreven: > On Tue, Sep 11, 2012 at 11:32 PM, Phil Blundell <philb@gnu.org> wrote: >> On Tue, 2012-09-11 at 22:59 -0700, Khem Raj wrote: >>> kernel compiler is not special and we currently have it so >>> we want to pass -march and -mtune options as CFLAGS to kernel >>> build so that compiler picks the right subarch flags when >>> compiling assembly files in particular. >> >> Historically, the kernel compiler has indeed been special: there have >> been some machines where, due to bugs in the kernel or the compiler or >> both, we need to use a different version of the compiler for the kernel >> than we use for userspace. The most famous example of this were the old >> ARM kernels back in the day which needed gcc-2.95 long after everyone >> else had stopped using it, but I think there might be a few cases where >> the same situation obtains even today. > > I agree with history but we have moved away from 2.9x for long. > moreover v1 of this patch has been posted for weeks no one raised a > concern which I take that such cases are not there anymore with > OE-Core > >> >> If you remove ${KERNEL_CCSUFFIX} then we will lose the ability to do >> that (easily). I'm not necessarily opposed to such a change but I think >> it does need to be justified with clear benefits. >> > > again if there is a usecase with OE-Core of such a kind. I will be > happy to deal with it no one has shown me one. The archos vendor kernels only work when built with CSL 2007, a common problem with TI kernels from that era ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2012-09-14 15:55 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-09-12 5:59 [PATCH V2 1/3] kernel.bbclass, module-base.bbclass: Use CC to form KERNEL_CC Khem Raj 2012-09-12 5:59 ` [PATCH 2/3] runqemu: Explicitly specify MACHINE when calling bitbake Khem Raj 2012-09-12 22:12 ` Scott Garman 2012-09-14 15:42 ` Saul Wold 2012-09-12 5:59 ` [PATCH 3/3] uclibc: Revert systemd regressing patch from upsteam uclibc Khem Raj 2012-09-12 6:37 ` Phil Blundell 2012-09-12 7:53 ` Khem Raj 2012-09-12 6:32 ` [PATCH V2 1/3] kernel.bbclass, module-base.bbclass: Use CC to form KERNEL_CC Phil Blundell 2012-09-12 7:49 ` Khem Raj 2012-09-13 18:02 ` Koen Kooi
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox