sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix libc/zoneinfo build

Browse Source
This commit is contained in:
Gregory Nutt 2016-06-30 16:20:43 -06:00
parent aa96a1d2ec
commit bde90de12f
7 changed files with 204 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Directories.mk
View File

@ -114,6 +114,10 @@ else
OTHERDIRS += syscall
endif
ifeq ($(CONFIG_LIB_ZONEINFO_ROMFS),y)
CONTEXTDIRS += libc
endif
ifeq ($(CONFIG_NX),y)
NONFSDIRS += graphics libnx
CONTEXTDIRS += graphics libnx

36
libc/Kconfig
View File

@ -321,7 +321,23 @@ config LIBC_TZDIR
This is the full path to the location where the TZ database is expected
to be found.
endif
config LIB_ZONEINFO
bool "TZ database"
default n
---help---
Download and build the TZ/Olson database.
if LIB_ZONEINFO
config LIB_ZONEINFO_ROMFS
bool "Build ROMFS filesystem"
default n
depends on FS_ROMFS
---help---
Build a mountable ROMFS filesystem containing the TZ/Olson database
endif # LIB_ZONEINFO
endif # LIBC_LOCALTIME
config TIME_EXTENDED
bool "Add day of week, year support"
@ -884,21 +900,3 @@ config LIB_HEX2BIN
---help---
Build in support for conversions from Intel Hex format to binary.
This selection enables the interfaces of include/hex2bin.h.
config LIB_ZONEINFO
bool "TZ database"
default n
depends on LIBC_LOCALTIME
---help---
Build the TZ/Olson database.
if LIB_ZONEINFO
config LIB_ZONEINFO_ROMFS
bool "Build ROMFS filesystem"
default n
depends on FS_ROMFS
---help---
Build a mountable ROMFS filesystem containing the TZ database
endif # LIB_ZONEINFO

17
libc/Makefile
View File

@ -1,7 +1,7 @@
############################################################################
# libc/Makefile
#
# Copyright (C) 2007-2014 Gregory Nutt. All rights reserved.
# Copyright (C) 2007-2014, 2016 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
@ -117,6 +117,9 @@ $(COBJS): $(BINDIR)$(DELIM)%$(OBJEXT): %.c
$(BIN): $(OBJS)
$(call ARCHIVE, $@, $(OBJS))
ifeq ($(CONFIG_LIB_ZONEINFO_ROMFS),y)
$(Q) $(MAKE) -C zoneinfo all TOPDIR=$(TOPDIR) BIN=$(BIN)
endif
# C library for the user phase of the two-pass kernel build
@ -132,6 +135,13 @@ $(KBIN):
$(Q) $(MAKE) $(KBIN) BIN=$(KBIN) BINDIR=kbin TOPDIR=$(TOPDIR) EXTRADEFINES=$(EXTRADEFINES)
endif
# Context
context:
ifeq ($(CONFIG_LIB_ZONEINFO_ROMFS),y)
$(Q) $(MAKE) -C zoneinfo context TOPDIR=$(TOPDIR) BIN=$(BIN)
endif
# Dependencies
.depend: Makefile $(SRCS)
@ -140,6 +150,9 @@ ifeq ($(CONFIG_BUILD_PROTECTED),y)
$(Q) $(MKDEP) --obj-path kbin --obj-suffix $(OBJEXT) $(DEPPATH) "$(CC)" -- $(CFLAGS) $(KDEFINE) -- $(SRCS) >Make_kbin.dep
else
$(Q) $(MKDEP) --obj-path bin --obj-suffix $(OBJEXT) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make_bin.dep
endif
ifeq ($(CONFIG_LIB_ZONEINFO_ROMFS),y)
$(Q) $(MAKE) -C zoneinfo depend TOPDIR=$(TOPDIR) BIN=$(BIN)
endif
$(Q) touch $@
@ -151,6 +164,7 @@ clean:
$(Q) $(MAKE) -C bin clean TOPDIR=$(TOPDIR)
$(Q) $(MAKE) -C ubin clean TOPDIR=$(TOPDIR)
$(Q) $(MAKE) -C kbin clean TOPDIR=$(TOPDIR)
$(Q) $(MAKE) -C zoneinfo clean TOPDIR=$(TOPDIR) BIN=$(BIN)
$(call DELFILE, $(BIN))
$(call DELFILE, $(UBIN))
$(call DELFILE, $(KBIN))
@ -162,6 +176,7 @@ distclean: clean
$(Q) $(MAKE) -C bin distclean TOPDIR=$(TOPDIR)
$(Q) $(MAKE) -C ubin distclean TOPDIR=$(TOPDIR)
$(Q) $(MAKE) -C kbin distclean TOPDIR=$(TOPDIR)
$(Q) $(MAKE) -C zoneinfo distclean TOPDIR=$(TOPDIR) BIN=$(BIN)
$(call DELFILE, Make_bin.dep)
$(call DELFILE, Make_ubin.dep)
$(call DELFILE, Make_kbin.dep)

8
libc/zoneinfo/.gitignore vendored
View File

@ -1,2 +1,10 @@
/.built
/.tzbuilt
/.tzunpack
/romfs_zoneinfo.img
/romfs_zoneinfo.h
/tzbin
/tzcode-latest.tar.gz
/tzcode
/tzdata-latest.tar.gz

47
libc/zoneinfo/Make.defs
View File

@ -1,47 +0,0 @@
############################################################################
# nuttx/zoneinfo/Make.defs
#
# Copyright (C) 2016 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in
# the documentation and/or other materials provided with the
# distribution.
# 3. Neither the name NuttX nor the names of its contributors may be
# used to endorse or promote products derived from this software
# without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
############################################################################
ifeq ($(CONFIG_LIB_ZONEINFO_ROMFS),y)
# Add the zoneinifo sources to the build
CSRCS += tzromfs.c
# Add the zoneinfo directory to the build
DEPPATH += --dep-path zoneinfo
VPATH += :zoneinfo
endif

157
libc/zoneinfo/Makefile Normal file
View File

@ -0,0 +1,157 @@
############################################################################
# libc/zoneinfo/Makefile
#
# Copyright (C) 2015-2016, Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in
# the documentation and/or other materials provided with the
# distribution.
# 3. Neither the name NuttX nor the names of its contributors may be
# used to endorse or promote products derived from this software
# without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
############################################################################
-include $(TOPDIR)/.config
-include $(TOPDIR)/Make.defs
ifeq ($(WINTOOL),y)
INCDIROPT = -w
endif
# Zoneinfo database
ASRCS =
CSRCS =
ifeq ($(CONFIG_LIB_ZONEINFO_ROMFS),y)
CSRCS += tzromfs.c
endif
AOBJS = $(ASRCS:.S=$(OBJEXT))
COBJS = $(CSRCS:.c=$(OBJEXT))
SRCS = $(ASRCS) $(CSRCS)
OBJS = $(AOBJS) $(COBJS)
ZONEINFO_PATH = $(TOPDIR)/libc/zoneinfo
TZBIN_PATH = $(ZONEINFO_PATH)/tzbin
TZCODE_PATH = $(ZONEINFO_PATH)/tzcode
ROOTDEPPATH = --dep-path .
# Common build
VPATH =
all: .built
.PHONY: romfs register context depend clean distclean
$(AOBJS): %$(OBJEXT): %.S
$(call ASSEMBLE, $<, $@)
$(COBJS): %$(OBJEXT): %.c
$(call COMPILE, $<, $@)
.built: .tzbuilt romfs $(OBJS)
$(call ARCHIVE, ..$(DELIM)$(BIN), $(OBJS))
$(Q) touch .built
# ROMFS file system containing the TZ database
ifeq ($(CONFIG_LIB_ZONEINFO_ROMFS),y)
checkgenromfs:
@genromfs -h 1>/dev/null 2>&1 || { \
echo "Host executable genromfs not available in PATH"; \
echo "You may need to download in from http://romfs.sourceforge.net/"; \
exit 1; \
}
romfs_zoneinfo.img : checkgenromfs .tzbuilt
@genromfs -f $@ -d $(TZBIN_PATH)/etc/zoneinfo -V "TZDatbase" || { echo "genromfs failed" ; exit 1 ; }
romfs_zoneinfo.h : romfs_zoneinfo.img
@xxd -i $< >$@ || { echo "xxd of $< failed" ; exit 1 ; }
romfs: romfs_zoneinfo.h
else
romfs:
endif # CONFIG_LIB_ZONEINFO_ROMFS
# Build TZ database
tzcode:
mkdir tzcode
tzbin:
mkdir tzbin
tzcode-latest.tar.gz:
$(Q) wget --retr-symlinks ftp://ftp.iana.org/tz/tzcode-latest.tar.gz
tzdata-latest.tar.gz:
$(Q) wget --retr-symlinks ftp://ftp.iana.org/tz/tzdata-latest.tar.gz
.tzunpack: tzcode tzcode-latest.tar.gz tzdata-latest.tar.gz
$(Q) tar zx -C tzcode -f tzcode-latest.tar.gz
$(Q) tar zx -C tzcode -f tzdata-latest.tar.gz
$(Q) touch .tzunpack
.tzbuilt: tzcode tzbin .tzunpack
$(Q) $(MAKE) -C tzcode TOPDIR=$(TZBIN_PATH) install
$(Q) touch .tzbuilt
# Create initial context
context: .tzbuilt romfs
# Create dependencies
.depend: Makefile $(SRCS)
$(Q) $(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
$(Q) touch $@
depend: .depend
clean:
$(call DELFILE, .built)
$(call CLEAN)
distclean: clean
$(call DELFILE, Make.dep)
$(call DELFILE, .depend)
$(call DELFILE, .tzunpack)
$(call DELFILE, .tzbuilt)
$(call DELFILE, romfs_zoneinfo.img)
$(call DELFILE, romfs_zoneinfo.h)
$(call DELFILE, tzdata-latest.tar.gz)
$(call DELFILE, tzcode-latest.tar.gz)
$(call DELDIR, tzbin)
$(call DELDIR, tzcode)
-include Make.dep

4
libc/zoneinfo/tzromfs.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* nuttx/zoneinfo/tzromfs.c
* libc/zoneinfo/tzromfs.c
*
* Copyright (C) 2015 Gregory Nutt. All rights reserved.
* Copyright (C) 2015-2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without