From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6680759771290664960 X-Received: by 2002:a7b:cf2b:: with SMTP id m11mr2675371wmg.56.1555586751687; Thu, 18 Apr 2019 04:25:51 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:4acf:: with SMTP id y15ls426901wrs.9.gmail; Thu, 18 Apr 2019 04:25:51 -0700 (PDT) X-Google-Smtp-Source: APXvYqzdEGrN51O5cl77rJzpHGYZS4PaC3nZ/QvEfLGs85wvqCGAPo6wG6PkL2/o1eVlp16nwvp7 X-Received: by 2002:adf:b68d:: with SMTP id j13mr63893683wre.50.1555586751255; Thu, 18 Apr 2019 04:25:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555586751; cv=none; d=google.com; s=arc-20160816; b=kmhZvof6xTU67+avNwv3W/TrouZEFfNh6TTrolaza+Cg5vAjZSFFYe2JGZrfzBULvC zSq6krW7RC1SSEligrqRG4n8FduFLwNXR2O+hn7nHMtvEzaT9Shd5mHXzscXwxVQuim3 NNTHIS5/ce5kEPz6poSmcvsDaHSTXDrWoxIPh7CNxOPHN2nn5c0IJWajseI+A/s8JeFE F8H6mQ0C0zTUTZLyVChzM4uMPE9vwu4zh5YMtVQmJTJOkBSsnJFAaZ3Nu55QaIVcgmKE ZH7YxKPNQ/mm5NVZl/VYnSfNGkmP75gS7zV7JFILYPb/IFUkXCTuDv0W6qTrIVMciV/p 4Jog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=oxEKs9KWJu09RzVBWRzWF0SafcIF1LmudzCScFTxpqA=; b=pUMR6Ya5GFkvUewQMg9qq3qxE/tWEuT8BkwhaVT0ANAquVYV/w/ZdgcpKQb4Dp5GiZ qlEea3OgoVuPyzpVWuDiAYMDrpxtQfpaRTz7pIAN1omDd0xRgzy2uouk9rmT4BgmSn+M qLO7LB4nSPlt8F7cZEv+f8c4sBq750rLFgOAs0Z0ShAU20e0ekasMkVG6g0xzh5ZZvvb VoUnVm1aRtJ1kQz0bvtd90oqQN+G6fvp0oj8+febQNco44IncJalDiFlVo4tnpe8zGQV U/vkHgKgr/kccUu113fp+9mWF4bB4+I1a1cAWbXqsVQITHnGVW7Y0jpQO+uu/bU2zmRi QzEw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id t137si99657wmt.0.2019.04.18.04.25.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Apr 2019 04:25:51 -0700 (PDT) Received-SPF: pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id x3IBPoV5014032 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 Apr 2019 13:25:50 +0200 Received: from ring.ppmd.siemens.net (linux-ses-ext02.ppmd.siemens.net [139.25.69.232]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x3IBPolI014428; Thu, 18 Apr 2019 13:25:50 +0200 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [PATCH 2/6] meta: remove transient package support Date: Thu, 18 Apr 2019 13:25:41 +0200 Message-Id: <20190418112545.1201-3-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190418112545.1201-1-claudius.heine.ext@siemens.com> References: <20190418112545.1201-1-claudius.heine.ext@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: kfYPrVQbBF1x From: Claudius Heine Transient packages where meant for configuring images via packages, which proved to not be fit for purpose. Packages are meant to be shared across images, configuring it this way would mean that every possible configuration permutation would need to result in a separate package just so that no image accidentally installs a configuration package meant for a different build/image. Instead images need to be configured while its specific root file system is created using the new root file system creation pipeline. Signed-off-by: Claudius Heine --- meta/classes/image.bbclass | 4 +- .../isar-cfg-localepurge/files/postinst | 15 ---- .../isar-cfg-localepurge.bb | 70 ------------------- .../isar-cfg-rootpw/files/postinst.tmpl | 19 ----- .../isar-cfg-rootpw/isar-cfg-rootpw.bb | 19 ----- 5 files changed, 1 insertion(+), 126 deletions(-) delete mode 100644 meta/recipes-support/isar-cfg-localepurge/files/postinst delete mode 100644 meta/recipes-support/isar-cfg-localepurge/isar-cfg-localepurge.bb delete mode 100644 meta/recipes-support/isar-cfg-rootpw/files/postinst.tmpl delete mode 100644 meta/recipes-support/isar-cfg-rootpw/isar-cfg-rootpw.bb diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index c795414..89dc5e4 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -36,9 +36,7 @@ def cfg_script(d): FILESPATH =. "${LAYERDIR_core}/conf/distro:" SRC_URI += "${@ cfg_script(d) }" -DEPENDS += "${IMAGE_INSTALL} ${IMAGE_TRANSIENT_PACKAGES}" - -IMAGE_TRANSIENT_PACKAGES += "isar-cfg-localepurge isar-cfg-rootpw" +DEPENDS += "${IMAGE_INSTALL}" ISAR_RELEASE_CMD_DEFAULT = "git -C ${LAYERDIR_core} describe --tags --dirty --match 'v[0-9].[0-9]*'" ISAR_RELEASE_CMD ?= "${ISAR_RELEASE_CMD_DEFAULT}" diff --git a/meta/recipes-support/isar-cfg-localepurge/files/postinst b/meta/recipes-support/isar-cfg-localepurge/files/postinst deleted file mode 100644 index 9dfd6f9..0000000 --- a/meta/recipes-support/isar-cfg-localepurge/files/postinst +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -set -e - -cat /usr/lib/isar-cfg-localepurge/locale.gen \ - >> /etc/locale.gen -cat /usr/lib/isar-cfg-localepurge/locale.default \ - > /etc/default/locale -cat /usr/lib/isar-cfg-localepurge/locale.nopurge \ - > /etc/locale.nopurge - -debconf-set-selections /usr/lib/isar-cfg-localepurge/locale.debconf - -dpkg-reconfigure -f noninteractive locales - -localepurge diff --git a/meta/recipes-support/isar-cfg-localepurge/isar-cfg-localepurge.bb b/meta/recipes-support/isar-cfg-localepurge/isar-cfg-localepurge.bb deleted file mode 100644 index 62b4b2d..0000000 --- a/meta/recipes-support/isar-cfg-localepurge/isar-cfg-localepurge.bb +++ /dev/null @@ -1,70 +0,0 @@ -# This software is a part of ISAR. - -DESCRIPTION = "Isar configuration package for locale and localepurge" -MAINTAINER = "isar-users " -DEBIAN_DEPENDS = "localepurge" - -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 '\n'.join(sorted(set(i.strip() - for i in locale_gen.split('\\n') - if i.strip()))) - -def get_dc_locale_gen(d): - locale_gen = d.getVar("LOCALE_GEN", True) or "" - return ', '.join(sorted(set(i.strip() - for i in locale_gen.split('\\n') - if i.strip()))) - -def get_nopurge(d): - locale_gen = d.getVar("LOCALE_GEN", True) or "" - return '\n'.join(sorted(set(i.strip() - for j in locale_gen.split('\\n') - if j.strip() - 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 - ${@get_locale_gen(d)} - __EOF__ - cat<<-__EOF__ > ${WORKDIR}/locale.debconf - locales locales/locales_to_be_generated multiselect ${@get_dc_locale_gen(d)} - locales locales/default_environment_locale select ${LOCALE_DEFAULT} - __EOF__ - cat<<-__EOF__ > ${WORKDIR}/locale.default - LANG=${LOCALE_DEFAULT} - __EOF__ - cat<<-__EOF__ > ${WORKDIR}/locale.nopurge - #USE_DPKG - MANDELETE - DONTBOTHERNEWLOCALE - #SHOWFREEDSPACE - #QUICKNDIRTYCALC - #VERBOSE - ${@get_nopurge(d)} - __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 \ - ${D}/usr/lib/${PN}/locale.debconf - install -v -m 644 ${WORKDIR}/locale.gen \ - ${D}/usr/lib/${PN}/locale.gen - install -v -m 644 ${WORKDIR}/locale.default \ - ${D}/usr/lib/${PN}/locale.default - install -v -m 644 ${WORKDIR}/locale.nopurge \ - ${D}/usr/lib/${PN}/locale.nopurge -} diff --git a/meta/recipes-support/isar-cfg-rootpw/files/postinst.tmpl b/meta/recipes-support/isar-cfg-rootpw/files/postinst.tmpl deleted file mode 100644 index ca08a41..0000000 --- a/meta/recipes-support/isar-cfg-rootpw/files/postinst.tmpl +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh -set -e - -if ! grep -q 'root:\*:' /etc/shadow; then - echo "ERROR:isar-cfg-rootpw: root password was set by a different package" >&2 - exit -1 -fi - -if [ -n '${CFG_ROOT_PW}' ]; then - echo 'root:${CFG_ROOT_PW}' | chpasswd -e -else - passwd -d root -fi - -if [ '${CFG_ROOT_LOCKED}' = "1" ]; then - # Lock the account after setting the password, since unlocking it at some - # point later would set it to the back to the previous one. - passwd -l root -fi diff --git a/meta/recipes-support/isar-cfg-rootpw/isar-cfg-rootpw.bb b/meta/recipes-support/isar-cfg-rootpw/isar-cfg-rootpw.bb deleted file mode 100644 index adee3b5..0000000 --- a/meta/recipes-support/isar-cfg-rootpw/isar-cfg-rootpw.bb +++ /dev/null @@ -1,19 +0,0 @@ -# This software is a part of ISAR. - -DESCRIPTION = "Isar configuration package for root password" -MAINTAINER = "isar-users " -DEBIAN_DEPENDS = "passwd" - -SRC_URI = "file://postinst.tmpl" - -TEMPLATE_FILES = "postinst.tmpl" -TEMPLATE_VARS = "CFG_ROOT_PW CFG_ROOT_LOCKED" - -CFG_ROOT_PW ??= "" -CFG_ROOT_LOCKED ??= "0" - -inherit dpkg-raw - -do_install() { - echo "intentionally left blank" -} -- 2.20.1