[ptxdist] [PATCH] timezone: rename GLIBC_LOCALTIME and targetinstall only if not empty

[Alexander Dahl <post@lespocky.de>]

Revised with fresh morning mind. I could not test the migrate stuff,
please review!

Greets
Alex

Signed-off-by: Alexander Dahl <post@lespocky.de>
---
 rules/timezone.in           |    5 +++--
 rules/timezone.make         |    6 +++---
 scripts/migrate/migrate_ptx |    6 ++++++
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/rules/timezone.in b/rules/timezone.in
index 09a3d9d..1298afc 100644
--- a/rules/timezone.in
+++ b/rules/timezone.in
@@ -15,7 +15,7 @@ if TIMEZONE
 
 comment "Timezone support"
 
-config GLIBC_LOCALTIME
+config TIMEZONE_LOCALTIME
 	prompt "Timezone for /etc/localtime and /etc/timezone"
 	default "Europe/Berlin"
 	string
@@ -23,7 +23,8 @@ config GLIBC_LOCALTIME
 	  Where should /etc/localtime point to? (e.g. put in "Europe/Berlin"
 	  here to let it point to /usr/share/zoneinfo/Europe/Berlin)
 	  Additionally this value is written to /etc/timezone like on Debian
-	  or for systemd.
+	  or for systemd. Note: if you leave this empty /etc/timezone and
+	  /etc/localtime are NOT created.
 
 config TIMEZONE_LOCAL_DATABASE
 	bool
diff --git a/rules/timezone.make b/rules/timezone.make
index 6625f85..b51e317 100644
--- a/rules/timezone.make
+++ b/rules/timezone.make
@@ -19,7 +19,7 @@ PACKAGES-$(PTXCONF_TIMEZONE) += timezone
 TIMEZONE_VERSION	:= 1.0
 TIMEZONE		:= timezone-$(TIMEZONE_VERSION)
 
-TIMEZONE_LOCALTIME_FILE	:= /usr/share/zoneinfo/$(PTXCONF_GLIBC_LOCALTIME)
+TIMEZONE_LOCALTIME_FILE	:= /usr/share/zoneinfo/$(PTXCONF_TIMEZONE_LOCALTIME)
 
 TIMEZONE-$(PTXCONF_TIMEZONE_AFRICA) := "Africa"
 TIMEZONE-$(PTXCONF_TIMEZONE_ATLANTIC) += "Atlantic"
@@ -118,12 +118,12 @@ $(STATEDIR)/timezone.targetinstall:
 		$(call install_copy, timezone, 0, 0, 0644, -, /usr/share/zoneinfo/$$f,n); \
         done
 
-ifdef PTXCONF_GLIBC_LOCALTIME
+ifneq ($(call remove_quotes,$(PTXCONF_TIMEZONE_LOCALTIME)),)
 	@$(call install_link, timezone, ..$(TIMEZONE_LOCALTIME_FILE), \
 		/etc/localtime)
 	@$(call install_alternative, timezone, 0, 0, 0644, /etc/timezone)
 	@$(call install_replace, timezone, /etc/timezone, @TIMEZONE@, \
-		$(PTXCONF_GLIBC_LOCALTIME))
+		$(PTXCONF_TIMEZONE_LOCALTIME))
 endif
 
 	@$(call install_finish, timezone)
diff --git a/scripts/migrate/migrate_ptx b/scripts/migrate/migrate_ptx
index 5682890..47f324b 100755
--- a/scripts/migrate/migrate_ptx
+++ b/scripts/migrate/migrate_ptx
@@ -189,3 +189,9 @@ s/^\(\(# \)\?PTXCONF_GLIBC_LOCALTIME\)_LINK\(.*\)/\1\3/
 # reason : cleanup
 #
 s/^\(\(# \)\?PTXCONF_GSTREAMER_\)_\(.*$\)/\1\3/
+
+#
+# symbol : GLIBC_LOCALTIME	-> TIMEZONE_LOCALTIME
+# reason : cleanup
+#
+s/^\(\(# \)\?PTXCONF_\)GLIBC\(_LOCALTIME\)/\1TIMEZONE\3/
-- 
1.7.2.5


-- 
ptxdist mailing list
ptxdist@pengutronix.de