From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6561021830257180672 X-Received: by 2002:adf:c707:: with SMTP id k7-v6mr1341102wrg.18.1527606935551; Tue, 29 May 2018 08:15:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:add5:: with SMTP id w79-v6ls4982820wrc.10.gmail; Tue, 29 May 2018 08:15:35 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoG8OjONsrhddPt7eTRmmAFYWa9ALaGKuFEA4LvS6Rp83oYG2LvnCWwlt9xeqzmUdwe4EOn X-Received: by 2002:adf:d842:: with SMTP id k2-v6mr1408039wrl.22.1527606935132; Tue, 29 May 2018 08:15:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527606935; cv=none; d=google.com; s=arc-20160816; b=SmA1VSyJwBHuIxaz0/VMpjoDehoBPlp6S1XkORt7NKHVOnQcMHLvY5u/4Ok8F7H7jH qZMPhz/QbRh5mBTxOTEPuPof18oAn+LHQqYBD3wqCWqpl+We5fuWH47N3QIX0xDyGE3D 1k5sQ/szWs4dVTEE8TWIV7Y0Y90zAdW9VTFNLHGD/gfXMDNCN9wkayEGXXT61Id064TJ gkWFH13OfZgZezXAEl1jCW52hL7OBViz9eKFWGDGoFwyf/IzsXLwe9AU5gNqdGuhmPKA JyJzouSjNB78XUmn1v4Zl1G6Drxal56TufUdKLvKuyWc4mV24bsLQ6B3PPDb+L1LA88/ bJeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=zq4PYRFC2spPR0tjFE9y22/gs39ICM2bEfvtw2U0JiA=; b=sndOvmjJ50EVTFUAn6OVYYgeB9juRZJHcQZpiU61AlUDC3kXe8KUcWwpI4wltlFTc/ y/GFNSk6/KYzWG9s4WZJS5CP+ZxCj+kozWZLPTZcLlQp1gLGUNOTRw25Bn+YgeU/zJ13 cGb+mdH1tPbtiXpmXv2ZXXr8pPKxdZsUr5pRo/+EEkONZQwnuv4O8sKUsVzbO1XF64DD nUrmjpyaGC6dGBrOp99GJssOraoOylbudDnCXPdd+nFBuL8qnBPfydXW4P8ySHb2i/Ip pVdb5Ff8P9F+smijgKnZb/NJB/NFfy/rt+ChC7bapH0HNSkD4BPS+2ybHV3fKpUOgP4w TgTw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Return-Path: Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id x3-v6si146502wrn.0.2018.05.29.08.15.35 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 May 2018 08:15:35 -0700 (PDT) Received-SPF: pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id w4TFFYGO000778 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 29 May 2018 17:15:34 +0200 Received: from ring.ppmd.siemens.net (linux-ses-ext02.ppmd.siemens.net [139.25.69.69]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id w4TFFYTG023462; Tue, 29 May 2018 17:15:34 +0200 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [PATCH 1/1] meta/isar-cfg-localepurge: move locale configuration inside bb Date: Tue, 29 May 2018 17:15:27 +0200 Message-Id: <20180529151527.6090-2-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180529151527.6090-1-claudius.heine.ext@siemens.com> References: <20180529151527.6090-1-claudius.heine.ext@siemens.com> X-TUID: aZ4pCMR9ztIs 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 \ -- 2.17.0