diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-07 13:02:16 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-07 13:02:16 +0200 |
| commit | ef993352859c8359e64fc92ca82c09a4bb9f7c5b (patch) | |
| tree | f52e5725bda2a9e9d14e5216436f9fe78f10ed01 | |
| parent | ee792cd4fe5062c8c488e1b43ab877bba6e073d2 (diff) | |
fix timezone configuration for eglibc/glibc based systems
| -rw-r--r-- | package/eglibc/Makefile | 5 | ||||
| -rw-r--r-- | package/glibc/Makefile | 5 | ||||
| -rw-r--r-- | toolchain/eglibc/patches/eglibc-cross.patch | 16 |
3 files changed, 6 insertions, 20 deletions
diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile index 7b09ea1e3..d64cdbac5 100644 --- a/package/eglibc/Makefile +++ b/package/eglibc/Makefile @@ -52,8 +52,9 @@ EGLIBC_ENV:= PATH='${TARGET_PATH}' \ do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} ${INSTALL_DIR} $(IDIR_EGLIBC)/lib $(IDIR_EGLIBC)/etc \ $(IDIR_EGLIBC)/usr/lib - # install /etc/localtime from host system (FIXME) - ${CP} /etc/localtime $(IDIR_EGLIBC)/etc + test -z $(ADK_RUNTIME_TIMEZONE) || \ + $(CP) /usr/share/zoneinfo/$(ADK_RUNTIME_TIMEZONE) \ + $(IDIR_EGLIBC)/etc/localtime $(CP) $(STAGING_DIR)/lib/ld* $(IDIR_EGLIBC)/lib/ $(CP) $(STAGING_DIR)/lib/libgcc_s.so* $(IDIR_EGLIBC)/lib/ -for file in libc libcrypt libdl libm libnsl libresolv librt libutil libnss_compat libnss_dns libnss_files; do \ diff --git a/package/glibc/Makefile b/package/glibc/Makefile index 1a4a330e9..483c5244d 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -41,8 +41,9 @@ SUB_INSTALLS-${ADK_PACKAGE_GLIBC_DEV}+= glibc-dev-install # compile nothing, glibc is already build in toolchain directory do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} ${INSTALL_DIR} $(IDIR_GLIBC)/lib $(IDIR_GLIBC)/etc - # install /etc/localtime from host system (FIXME) - ${CP} /etc/localtime $(IDIR_GLIBC)/etc + test -z $(ADK_RUNTIME_TIMEZONE) || \ + $(CP) /usr/share/zoneinfo/$(ADK_RUNTIME_TIMEZONE) \ + $(IDIR_EGLIBC)/etc/localtime $(CP) $(STAGING_DIR)/lib/libgcc_s.so* $(IDIR_GLIBC)/lib/ $(CP) $(STAGING_DIR)/lib/ld*.so* $(IDIR_GLIBC)/lib/ -for file in libc libcrypt libdl libm libnsl libresolv librt libutil libnss_compat libnss_dns libnss_files; do \ diff --git a/toolchain/eglibc/patches/eglibc-cross.patch b/toolchain/eglibc/patches/eglibc-cross.patch index e2cc86c2e..c09b2f752 100644 --- a/toolchain/eglibc/patches/eglibc-cross.patch +++ b/toolchain/eglibc/patches/eglibc-cross.patch @@ -62,22 +62,6 @@ diff -Nur eglibc-2.11.1.orig/libc/sunrpc/rpc_scan.c eglibc-2.11.1/libc/sunrpc/rp diff -Nur eglibc-2.11.1.orig/libc/timezone/Makefile eglibc-2.11.1/libc/timezone/Makefile --- eglibc-2.11.1.orig/libc/timezone/Makefile 2010-02-24 08:09:02.000000000 +0100 +++ eglibc-2.11.1/libc/timezone/Makefile 2010-03-22 18:50:04.134408513 +0100 -@@ -69,10 +69,11 @@ - $(addprefix $(inst_zonedir)/, \ - $(posixrules-file))) - --install-others = $(addprefix $(inst_zonedir)/,$(zonenames) \ -- $(zonenames:%=posix/%) \ -- $(zonenames:%=right/%)) \ -- $(installed-localtime-file) $(installed-posixrules-file) -+install-others = -+#install-others = $(addprefix $(inst_zonedir)/,$(zonenames) \ -+# $(zonenames:%=posix/%) \ -+# $(zonenames:%=right/%)) \ -+# $(installed-localtime-file) $(installed-posixrules-file) - - ifeq ($(have-ksh),yes) - install-others += $(inst_zonedir)/iso3166.tab $(inst_zonedir)/zone.tab @@ -181,8 +182,9 @@ $(objpfx)zic: $(addprefix $(objpfx), $(zic-objs)) |