From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6561021830257180672 X-Received: by 2002:a19:20ce:: with SMTP id g197-v6mr73703lfg.34.1527669537135; Wed, 30 May 2018 01:38:57 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:4488:: with SMTP id b8-v6ls3980525ljf.12.gmail; Wed, 30 May 2018 01:38:56 -0700 (PDT) X-Google-Smtp-Source: ADUXVKI7b8SXqiMk95Y7Oj6YsOBw3yeKr8cZaYJQa43/A1C6VdGDIGTAyWqHlLP3ClkBH4qBtQ/X X-Received: by 2002:a2e:83c9:: with SMTP id s9-v6mr105223ljh.15.1527669536639; Wed, 30 May 2018 01:38:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527669536; cv=none; d=google.com; s=arc-20160816; b=mWHp6wfrHE3yH1mOGqUPU4TuyXztYaL5A6h88ixK9LjSPMmqTdZdoVSJFAk0K912Os jz062GxWiwwY212xr1AB3gCKmcj2RbFb8VmLuGQFicwAW7eORvlSdcg/Sne7NKShikal 7O2Eht0oUiv9jmqsh97R6fDLZPaVW/ftKM5a59aYLUnyuK2ZG0TSLIxBF+YFhhTk0lLo XCaCvljZnnhzaOccJI+Ylv/8t29IpBw0dXXcP7hG/N65mR1Bqk/hbwKdTzEdqzr2YWwA DAcVvfND4a2pk/NZxAJsB5OsLvum+RzHmyoxcpOIiirsoVX6ppfn8zyv39oJjusDVflY 6FGw== 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:organization:from:references:cc:to :subject:arc-authentication-results; bh=VJ14d7SGAKCV0WTuN5rR3FUbwmn1vTO42zaQ5ZcUB2Q=; b=kBwGBPriLAzwQa3AONQT0EWkv+EguPrNrPJmXh762dAUcQxpZCk+kUUUdLmk64DEaT aXxtndspCNGbFcLBdXBhk4HIWmCxXDpaZJA2on4dOMkdYetLTnK5UxtEYk1kgs9TYE1R dcO0cIUr6sKaNkoJu1BNCsKhYKaDepXRvHM5Jrrwj+s7q/xxx0XZbome6IRtN4AzBcQT h7jtkqEMWvi+dIZyQU3TjxSuQyLrEiQItZKJxpeDJeqAZkyJFSQtbCHqGnWOpzRjNixe fjLpXSsnvTAPuua7y0glCuD79YElMnSav/dO1B4l+GaB6+SawwxWQ5v29u5YKVhXVs1n 0GBg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id b17-v6si1228272lfa.2.2018.05.30.01.38.56 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 May 2018 01:38:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) client-ip=85.214.62.211; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Received: from [192.168.50.163] (d51A48A80.access.telenet.be [81.164.138.128]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id w4U8cqJR009094 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); Wed, 30 May 2018 10:38:53 +0200 Subject: Re: [PATCH 1/1] meta/isar-cfg-localepurge: move locale configuration inside bb To: Claudius Heine , isar-users@googlegroups.com Cc: Claudius Heine References: <20180529151527.6090-1-claudius.heine.ext@siemens.com> <20180529151527.6090-2-claudius.heine.ext@siemens.com> From: "Maxim Yu. Osipov" Organization: ilbers GmbH Message-ID: <95520f31-8fcd-f012-9f43-0188f5312f09@ilbers.de> Date: Wed, 30 May 2018 10:38:51 +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: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-TUID: BPSaI3icqh+I Hi Claudius, Yesterday you've sent this patch over the same codebase you've sent 3 hours before (One shot configuration patch series V5). Is it possible to avoid in the future such frequency of incremental patches as process of testing/applying patches is rather time consuming. Kind regards, Maxim. On 05/30/2018 10:23 AM, Claudius Heine wrote: > 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 \ >> > -- Maxim Osipov ilbers GmbH Maria-Merian-Str. 8 85521 Ottobrunn Germany +49 (151) 6517 6917 mosipov@ilbers.de http://ilbers.de/ Commercial register Munich, HRB 214197 General Manager: Baurzhan Ismagulov