Quellcode durchsuchen

Merge branch 'master' of git+ssh://openadk.org/git/openadk

Waldemar Brodkorb vor 11 Jahren
Ursprung
Commit
7f43a82790
2 geänderte Dateien mit 8 neuen und 7 gelöschten Zeilen
  1. 1 4
      TODO
  2. 7 3
      package/tzdata/Makefile

+ 1 - 4
TODO

@@ -1,14 +1,11 @@
-- tzdata split + update
+- check gold for mozilla compile
 - getty + serial rework
 - add daemon() function to functions.sh
 - add printing of OK/FAIL (optional verbose bootup)
 - fixup rework libgcc --export-symbols
 - libgcc static?
-- remove 32 bit kernel for 64 bit targets
 - static toolchain support
 - toolchain in /usr , check gcj
-- rework startup, maybe use init.c, start gettys after bootup ready
-- more output for initscripts on bootup
 - try Preset Loops per Jiffy for faster bootup via lpj=
 - port uuterm
 - hash-style=gnu for non-mips and non-musl

+ 7 - 3
package/tzdata/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		tzdata
 PKG_VERSION:=		2013d
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		65b6818162230fc02f86f293376c73df 4616a9560270f180eeb9a08540636890
 PKG_DESCR:=		Timezone data (/usr/share/zoneinfo)
 PKG_SECTION:=		utils
@@ -39,8 +39,12 @@ ALL_TARGET:=		ALL
 INSTALL_TARGET:=	INSTALL
 
 tzdata-install:
-	$(INSTALL_DIR) $(IDIR_TZDATA)/usr/share $(IDIR_TZDATA)/etc
-	$(CP) $(WRKINST)/usr/share/zoneinfo $(IDIR_TZDATA)/usr/share
+	$(INSTALL_DIR) $(IDIR_TZDATA)/usr/share/zoneinfo $(IDIR_TZDATA)/etc
+	cd ${WRKINST} && for f in UTC ${ADK_RUNTIME_TIMEZONE}; do \
+		test -s usr/share/zoneinfo/"$$f" || continue; \
+		echo usr/share/zoneinfo/"$$f" | \
+		${STAGING_HOST_DIR}/usr/bin/cpio -pdu ${IDIR_TZDATA}/; \
+	done
 	tz=; cd $(IDIR_TZDATA)/usr/share/zoneinfo || exit 1; \
 		for f in UTC ${ADK_RUNTIME_TIMEZONE}; do \
 			test -s "$$f" || continue; \