From patchwork Mon Mar 3 22:10:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 326070 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 31DD92C00C3 for ; Tue, 4 Mar 2014 09:10:37 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 42B20964F8; Mon, 3 Mar 2014 22:10:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iFFfSk3Nf-qW; Mon, 3 Mar 2014 22:10:34 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 0925D960C7; Mon, 3 Mar 2014 22:10:34 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 245BC1BF9D8 for ; Mon, 3 Mar 2014 22:10:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1F673EE20 for ; Mon, 3 Mar 2014 22:10:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vPuB6m50Ls3f for ; Mon, 3 Mar 2014 22:10:31 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f42.google.com (mail-wg0-f42.google.com [74.125.82.42]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 029F3EDCF for ; Mon, 3 Mar 2014 22:10:30 +0000 (UTC) Received: by mail-wg0-f42.google.com with SMTP id y10so3973579wgg.25 for ; Mon, 03 Mar 2014 14:10:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=IecgAjyFz6HMxqfLTrV6b5Ymb5h5DUyyaY/d3CNAsYg=; b=xKQIxxYeN/cxjk4BM+v8vaZJ1UPBJJI+GXz9UNmnnA2ow0ZIkzIPI0jmVbFeNgoqKi HDsKlpWNAHNjtukyii4BYN5sw8O0Uer05fKl9ouOSLKPQOT9Vr/l3BzIebf4mDTTacHT 5w0F3d8yOtZ7lAsiyBmZQYutPe0ie2E9/mObqaAOqRsLwNmmwhWzCj2byDC+oVRCYILu Asc4B1lQPRbhAThjLZrB9fOOrG6d06Uqlig2yEYSbTsDOf1So/jKM6ULrq0GoVDe24ru uvbaNNpUsMbP3HkFl1Bn+aduLGxCB7gcSXz1XOqH6EuDTAqfG0HVjvmmfJE47gZsAUq7 lI+g== X-Received: by 10.194.8.196 with SMTP id t4mr13533300wja.49.1393884629540; Mon, 03 Mar 2014 14:10:29 -0800 (PST) Received: from gourin.bzh.lan (ks3095497.kimsufi.com. [94.23.60.27]) by mx.google.com with ESMTPSA id f7sm41763976wjb.7.2014.03.03.14.10.27 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 03 Mar 2014 14:10:28 -0800 (PST) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Mon, 3 Mar 2014 23:10:20 +0100 Message-Id: <93d239b65ddcb83fa33cbc79eecf5f901526860e.1393884458.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: References: Cc: "Yann E. MORIN" Subject: [Buildroot] [PATCH 1/7] system: make the zoneinfo list a system option X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net From: "Yann E. MORIN" Signed-off-by: "Yann E. MORIN" Cc: Alexandre Belloni --- Note: because the tzdata package loses its prompt, it defaults to 'n'. This means a user will loose his timezone settings, unless he selects to install timezone info in the system configuration menu. We can not add a legacy option for that, or we'd get a circular dependency. The only way we'd be fool-proof would be by renaming the package altogether, and adding a legacy option for the old name. --- Config.in.legacy | 15 +++++++++++++++ package/tzdata/Config.in | 23 +++-------------------- package/tzdata/tzdata.mk | 4 ++-- system/Config.in | 22 ++++++++++++++++++++++ 4 files changed, 42 insertions(+), 22 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index afcd3b1..5e2970a 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -184,6 +184,21 @@ config BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS ############################################################################### comment "Legacy options removed in 2014.02" +config BR2_TARGET_TZ_ZONELIST + default BR2_PACKAGE_TZDATA_ZONELIST if BR2_PACKAGE_TZDATA_ZONELIST != "" + +config BR2_PACKAGE_TZDATA_ZONELIST + string "tzdata: the timezone list option has been renamed" + help + The option BR2_PACKAGE_TZDATA_ZONELIST has been renamed to + BR2_TARGET_TZ_ZONELIST, and moved to the "System configuration" + menu. You'll need to select BR2_TARGET_TZ_INFO. + +config BR2_PACKAGE_TZDATA_ZONELIST_WRAP + bool + default y if BR2_PACKAGE_TZDATA_ZONELIST != "" + select BR2_LEGACY + config BR2_sh2 bool "sh2 support removed" help diff --git a/package/tzdata/Config.in b/package/tzdata/Config.in index 1be6814..1e6cc0f 100644 --- a/package/tzdata/Config.in +++ b/package/tzdata/Config.in @@ -1,26 +1,9 @@ -comment "tzdata needs an (e)glibc toolchain" - depends on !BR2_TOOLCHAIN_USES_GLIBC +# This package is not meant to be user-visible. +# It gets selected by BR2_TARGET_TZ in system/Config.in config BR2_PACKAGE_TZDATA - bool "tzdata" - depends on BR2_TOOLCHAIN_USES_GLIBC + bool help Time zone database http://www.iana.org/time-zones/repository/tz-link.html - -if BR2_PACKAGE_TZDATA - -config BR2_PACKAGE_TZDATA_ZONELIST - string "Time zone list" - default "default" - help - Space-separated list of time zones to compile. - - The value "default" includes all commonly used time zones. Note - that this set consumes around 5.5M. - - The full list is the list of files in the time zone database source, - not including the build and .tab files. - -endif diff --git a/package/tzdata/tzdata.mk b/package/tzdata/tzdata.mk index 1cb5b3f..b6f07e2 100644 --- a/package/tzdata/tzdata.mk +++ b/package/tzdata/tzdata.mk @@ -13,10 +13,10 @@ TZDATA_LICENSE = Public domain TZDATA_DEFAULT_ZONELIST = africa antarctica asia australasia backward etcetera \ europe factory northamerica pacificnew southamerica -ifeq ($(call qstrip,$(BR2_PACKAGE_TZDATA_ZONELIST)),default) +ifeq ($(call qstrip,$(BR2_TARGET_TZ_ZONELIST)),default) TZDATA_ZONELIST = $(TZDATA_DEFAULT_ZONELIST) else -TZDATA_ZONELIST = $(call qstrip,$(BR2_PACKAGE_TZDATA_ZONELIST)) +TZDATA_ZONELIST = $(call qstrip,$(BR2_TARGET_TZ_ZONELIST)) endif # Don't strip any path components during extraction. diff --git a/system/Config.in b/system/Config.in index 89578c5..7ea0208 100644 --- a/system/Config.in +++ b/system/Config.in @@ -265,6 +265,28 @@ config BR2_TARGET_GENERIC_GETTY_OPTIONS endmenu endif +config BR2_TARGET_TZ_INFO + bool "Install timezone info" + depends on BR2_TOOLCHAIN_USES_GLIBC + select BR2_PACKAGE_TZDATA + help + Say 'y' here to install timezone info. + +if BR2_TARGET_TZ_INFO + +config BR2_TARGET_TZ_ZONELIST + string "timezone list" + help + Space-separated list of time zones to compile. + + The value "default" includes all commonly used time zones. Note + that this set consumes around 5.5M. + + The full list is the list of files in the time zone database source, + not including the build and .tab files. + +endif # BR2_TARGET_TZ_INFO + config BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW bool "remount root filesystem read-write during boot" default y