From 5a65c76bc3d72ea9f275a3c474d5e308cf367a82 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 6 Jan 2011 23:18:06 +0100 Subject: remove obsolete SUB_INSTALL stuff. --- package/glibc/Makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'package/glibc') diff --git a/package/glibc/Makefile b/package/glibc/Makefile index 8b4584373..f3e757d95 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -20,12 +20,8 @@ CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -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} +do-install: ${INSTALL_DIR} $(IDIR_GLIBC)/lib $(IDIR_GLIBC)/etc test -z $(ADK_RUNTIME_TIMEZONE) || \ $(CP) /usr/share/zoneinfo/$(ADK_RUNTIME_TIMEZONE) \ -- cgit v1.2.3 From 7e58edfad5318ab12b990099e220be91b47366c0 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Fri, 7 Jan 2011 18:21:39 +0100 Subject: glibc: install some glibc-shipped config files - /etc/gai.conf - /etc/nscd.conf - /etc/nsswitch.conf Signed-off-by: Phil Sutter --- package/glibc/Makefile | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'package/glibc') diff --git a/package/glibc/Makefile b/package/glibc/Makefile index 8b4584373..cae293428 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -30,6 +30,10 @@ do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} test -z $(ADK_RUNTIME_TIMEZONE) || \ $(CP) /usr/share/zoneinfo/$(ADK_RUNTIME_TIMEZONE) \ $(IDIR_GLIBC)/etc/localtime + ${CP} ${STAGING_DIR}/etc/gai.conf ${IDIR_GLIBC}/etc/ + ${CP} ${STAGING_DIR}/etc/nscd.conf ${IDIR_GLIBC}/etc/ + ${CP} ${STAGING_DIR}/etc/nsswitch.conf ${IDIR_GLIBC}/etc/ + #$(CP) $(STAGING_DIR)/lib/libgcc_s.so* $(IDIR_GLIBC)/lib/ $(CP) $(STAGING_TARGET_DIR)/lib/ld*.so* $(IDIR_GLIBC)/lib/ -for file in libc libcrypt libdl libm libresolv librt libutil libnss_compat libnss_dns libnss_files; do \ $(CP) $(STAGING_TARGET_DIR)/lib/$$file.so* $(IDIR_GLIBC)/lib/; \ -- cgit v1.2.3 From 16d94117a716fc361d3db9a2a17cf4c45eab837d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 10 Jan 2011 10:49:04 +0100 Subject: s/STAGING_DIR/STAGING_TARGET_DIR/ --- package/glibc/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'package/glibc') diff --git a/package/glibc/Makefile b/package/glibc/Makefile index cae293428..3dee91994 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -30,10 +30,9 @@ do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} test -z $(ADK_RUNTIME_TIMEZONE) || \ $(CP) /usr/share/zoneinfo/$(ADK_RUNTIME_TIMEZONE) \ $(IDIR_GLIBC)/etc/localtime - ${CP} ${STAGING_DIR}/etc/gai.conf ${IDIR_GLIBC}/etc/ - ${CP} ${STAGING_DIR}/etc/nscd.conf ${IDIR_GLIBC}/etc/ - ${CP} ${STAGING_DIR}/etc/nsswitch.conf ${IDIR_GLIBC}/etc/ - #$(CP) $(STAGING_DIR)/lib/libgcc_s.so* $(IDIR_GLIBC)/lib/ + ${CP} ${STAGING_TARGET_DIR}/etc/gai.conf ${IDIR_GLIBC}/etc/ + ${CP} ${STAGING_TARGET_DIR}/etc/nscd.conf ${IDIR_GLIBC}/etc/ + ${CP} ${STAGING_TARGET_DIR}/etc/nsswitch.conf ${IDIR_GLIBC}/etc/ $(CP) $(STAGING_TARGET_DIR)/lib/ld*.so* $(IDIR_GLIBC)/lib/ -for file in libc libcrypt libdl libm libresolv librt libutil libnss_compat libnss_dns libnss_files; do \ $(CP) $(STAGING_TARGET_DIR)/lib/$$file.so* $(IDIR_GLIBC)/lib/; \ -- cgit v1.2.3 From 903a9849d50273c9d63e3be4ca85b1ea847cdf0d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 10 Jan 2011 22:47:51 +0100 Subject: fix timezone configuration for glibc based systems --- package/glibc/Makefile | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'package/glibc') diff --git a/package/glibc/Makefile b/package/glibc/Makefile index f509e3f3c..9d890c18b 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -23,9 +23,22 @@ INSTALL_STYLE:= manual # compile nothing, glibc is already build in toolchain directory do-install: ${INSTALL_DIR} $(IDIR_GLIBC)/lib $(IDIR_GLIBC)/etc - test -z $(ADK_RUNTIME_TIMEZONE) || \ - $(CP) /usr/share/zoneinfo/$(ADK_RUNTIME_TIMEZONE) \ - $(IDIR_GLIBC)/etc/localtime + cd ${STAGING_TARGET_DIR} && for f in UTC ${ADK_RUNTIME_TIMEZONE}; do \ + test -s usr/share/zoneinfo/"$$f" || continue; \ + echo usr/share/zoneinfo/"$$f" | \ + ${TOOLS_DIR}/cpio -pdu ${IDIR_GLIBC}/; \ + done + tz=; cd ${IDIR_GLIBC}/usr/share/zoneinfo || exit 1; \ + for f in UTC ${ADK_RUNTIME_TIMEZONE}; do \ + test -s "$$f" || continue; \ + tz=$$f; \ + done; if test x"$$tz" = x""; then \ + echo >&2 Error during timezone installation; \ + exit 1; \ + else \ + ln -sf "../usr/share/zoneinfo/$$tz" \ + ${IDIR_GLIBC}/etc/localtime; \ + fi ${CP} ${STAGING_TARGET_DIR}/etc/gai.conf ${IDIR_GLIBC}/etc/ ${CP} ${STAGING_TARGET_DIR}/etc/nscd.conf ${IDIR_GLIBC}/etc/ ${CP} ${STAGING_TARGET_DIR}/etc/nsswitch.conf ${IDIR_GLIBC}/etc/ -- cgit v1.2.3