From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6561021830257180672 X-Received: by 2002:a1c:741a:: with SMTP id p26-v6mr92894wmc.15.1527668586079; Wed, 30 May 2018 01:23:06 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:98f6:: with SMTP id w109-v6ls11270106wrb.2.gmail; Wed, 30 May 2018 01:23:05 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLlRBUUkRxutfXXRxSq9uVy1kIB6Y2WYqPHd7odz8EpnNqdA34T4p+jAOhHYZvDq4RQMaBv X-Received: by 2002:adf:9e0c:: with SMTP id u12-v6mr132174wre.8.1527668585526; Wed, 30 May 2018 01:23:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527668585; cv=none; d=google.com; s=arc-20160816; b=LfENfIlnOBw5Nhpip4atE8HEOD6IQfr5CfqWhdlEOIxIrBlE7YEh2iUdnQrgc8VEr5 jEJAYv3gfdzVADMXKL5XC+QGnY0sf00Q6fjVm/Kq1hwCtlPf3bl8VvRGcQ8C0IQpakk9 trgmg6pxIo4GQxOShcRmlIKEpTjvGj2j/MO1OSrAa26+gN/5PvELjf72sHqm/k7DDHps BLS4o68+B97o6g9lGjzPNoHVf1W2ZXp06YyaPGJLDnl5cC5F5SxJaeJc+csovY2i709/ vsag//HyWHvy3eHFr0cx3NkTvkiSM1fz37HOJdgfdw6V3dxc6kffPPcm3Pnmksg61dAV XmIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:references:cc:to:from:subject :arc-authentication-results; bh=OERFuPga5RdLm0XDi/YsxKfMtLWs+NLeVkS57NamajQ=; b=UN7H38Xo0qPJUvGbNRp0iWD7ZCvwUBc8hjxXwGgLewVPq0ZKPwvQI7c+Ng+DH3TxZH C/eW87NboUauRCsCtsce5XdRZjh5shrlisJIF/Qlxd2dETBiMaVwwZOABGJ+9k6TaOku aBTb8ONH72XXi6IsR7DZPevYssnbg1RXkMklsLCGPTCmvZcmRHtUBkU6lIA1/S1QPo02 QJUMR6RMfvaz+Gu2xWTS6l/pbqSNa4amYbqypAMlBNIip6k56LMNklmBwi1C4KcVcqWJ 4ZziyPa1kAYQayGtKLuStXe4VHAqik0RVPGkfagKfET34pOo5R6rO3DSeslMmCG5TFj0 MR2g== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id 4-v6si244148wme.1.2018.05.30.01.23.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 May 2018 01:23:05 -0700 (PDT) Received-SPF: pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id w4U8N4K3031613 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 30 May 2018 10:23:04 +0200 Received: from [139.25.69.69] (linux-ses-ext02.ppmd.siemens.net [139.25.69.69]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id w4U8N4PB032493; Wed, 30 May 2018 10:23:04 +0200 Subject: Re: [PATCH 1/1] meta/isar-cfg-localepurge: move locale configuration inside bb From: Claudius Heine To: isar-users@googlegroups.com Cc: Claudius Heine References: <20180529151527.6090-1-claudius.heine.ext@siemens.com> <20180529151527.6090-2-claudius.heine.ext@siemens.com> Message-ID: Date: Wed, 30 May 2018 10:23:04 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 MIME-Version: 1.0 In-Reply-To: <20180529151527.6090-2-claudius.heine.ext@siemens.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: vmvE6pdohdzJ Hi, sorry, but I messed this patch up. I will fix it an repost it again with documentation. Claudius On 2018-05-29 17:15, [ext] claudius.heine.ext@siemens.com wrote: > From: Claudius Heine > > To set custom locale configuration it in necessary to overwrite the > files of isar-cfg-localepurge before. That can be a bit of a hassle. > > With this patch the locale configuration is generated based on bitbake > variables and therefor can be set from outside. > > The new variables are `LOCALE_GEN` which is basically the content of the > desired `/etc/locale.gen` with each line seperated by '\n' and > `LOCALE_DEFAULT` which sets the global default locale of the system. > > Signed-off-by: Claudius Heine > --- > .../isar-cfg-localepurge/files/locale.debconf | 12 ------ > .../isar-cfg-localepurge/files/locale.gen | 1 - > .../isar-cfg-localepurge.bb | 43 +++++++++++++++++-- > 3 files changed, 40 insertions(+), 16 deletions(-) > delete mode 100644 meta/recipes-support/isar-cfg-localepurge/files/locale.debconf > delete mode 100644 meta/recipes-support/isar-cfg-localepurge/files/locale.gen > > diff --git a/meta/recipes-support/isar-cfg-localepurge/files/locale.debconf b/meta/recipes-support/isar-cfg-localepurge/files/locale.debconf > deleted file mode 100644 > index 169c071..0000000 > --- a/meta/recipes-support/isar-cfg-localepurge/files/locale.debconf > +++ /dev/null > @@ -1,12 +0,0 @@ > -locales locales/locales_to_be_generated multiselect en_US.UTF-8 UTF-8 > -locales locales/default_environment_locale select en_US.UTF-8 > - > -localepurge localepurge/dontbothernew boolean true > -localepurge localepurge/nopurge multiselect en, en_US, en_US.UTF-8 > -localepurge localepurge/use-dpkg-feature boolean false > -localepurge localepurge/verbose boolean false > -localepurge localepurge/showfreedspace boolean false > -localepurge localepurge/none_selected boolean false > -localepurge localepurge/mandelete boolean true > -localepurge localepurge/quickndirtycalc boolean false > -localepurge localepurge/remove_no note > diff --git a/meta/recipes-support/isar-cfg-localepurge/files/locale.gen b/meta/recipes-support/isar-cfg-localepurge/files/locale.gen > deleted file mode 100644 > index a66d814..0000000 > --- a/meta/recipes-support/isar-cfg-localepurge/files/locale.gen > +++ /dev/null > @@ -1 +0,0 @@ > -en_US.UTF-8 UTF-8 > diff --git a/meta/recipes-support/isar-cfg-localepurge/isar-cfg-localepurge.bb b/meta/recipes-support/isar-cfg-localepurge/isar-cfg-localepurge.bb > index d2cf1f3..f815717 100644 > --- a/meta/recipes-support/isar-cfg-localepurge/isar-cfg-localepurge.bb > +++ b/meta/recipes-support/isar-cfg-localepurge/isar-cfg-localepurge.bb > @@ -4,12 +4,49 @@ DESCRIPTION = "Isar configuration package for locale and localepurge" > MAINTAINER = "isar-users " > DEBIAN_DEPENDS = "localepurge" > > -SRC_URI = "file://locale.debconf \ > - file://locale.gen \ > - file://postinst" > +SRC_URI = "file://postinst" > > inherit dpkg-raw > > +LOCALE_GEN ?= "en_US.UTF-8 UTF-8\n\ > + en_US ISO-8859-1\n" > +LOCALE_DEFAULT ?= "en_US.UTF-8" > + > +def get_locale_gen(d): > + locale_gen = d.getVar("LOCALE_GEN", True) or "" > + return ', '.join(sorted(set(i.strip() > + for i in locale_gen.split('\\n')))) > + > +def get_nopurge(d): > + locale_gen = d.getVar("LOCALE_GEN", True) or "" > + return ', '.join(sorted(set(i.strip() > + for j in locale_gen.split('\\n') > + for i in (j.split()[0].split("_")[0], > + j.split()[0].split(".")[0], > + j.split()[0])))) > + > +do_gen_config[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" > +do_gen_config() { > + cat<<-__EOF__ > ${WORKDIR}/locale.gen > + ${@(d.getVar("LOCALE_GEN", True) or "").replace('\\n','\n')} > + __EOF__ > + cat<<-__EOF__ > ${WORKDIR}/locale.debconf > + locales locales/locales_to_be_generated multiselect ${@get_locale_gen(d)} > + locales locales/default_environment_locale select ${LOCALE_DEFAULT} > + > + localepurge localepurge/dontbothernew boolean true > + localepurge localepurge/nopurge multiselect ${@get_nopurge(d)} > + localepurge localepurge/use-dpkg-feature boolean false > + localepurge localepurge/verbose boolean false > + localepurge localepurge/showfreedspace boolean false > + localepurge localepurge/none_selected boolean false > + localepurge localepurge/mandelete boolean true > + localepurge localepurge/quickndirtycalc boolean false > + localepurge localepurge/remove_no note > + __EOF__ > +} > +addtask gen_config after do_unpack before do_install > + > do_install() { > install -v -d ${D}/usr/lib/${PN} > install -v -m 644 ${WORKDIR}/locale.debconf \ > -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: ch@denx.de