From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6652665106569101312 X-Received: by 2002:a17:906:6889:: with SMTP id n9mr320984ejr.4.1548950148868; Thu, 31 Jan 2019 07:55:48 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:4acd:: with SMTP id u13-v6ls1256524ejt.6.gmail; Thu, 31 Jan 2019 07:55:48 -0800 (PST) X-Google-Smtp-Source: AHgI3IbmDSkLfQTwWymZ+EtSPsdFjlGh1egWW6aOTxL7104zMs6L8/PaAi91Apz595rNuExZzU+e X-Received: by 2002:a17:906:8da:: with SMTP id o26mr120798eje.7.1548950148317; Thu, 31 Jan 2019 07:55:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548950148; cv=none; d=google.com; s=arc-20160816; b=eYRuVLedpxu90i989pAu95S6QW9VCXtdn+1uZppoyGL4kc9ttNBsbg0FDS2Tc1W3/O 12xMmOJCXEH9pV5cVeIp3r+RHPfJvJseZBrULGrqN7geTMUIyWPl5vOrSItIDsVuDUli hdtJpnHbGBmt6cfivYxeJFpH0vC+RBuyp6dfcfmfc18/oMfQZy3B+5wymtrV/vI8Qd7q OJBv04RHt8ATJBmu0FxFfney5jqRjy0ZTV0Fm2oHjDXwLaZ3EyRFAEKBJnofc8VH8fju le/01++yfWQHX3uVQ3CJX3Eg2DVMR64/e/Ru6nV+YrwCCh4obvXz2CVwHFgrsFGuAm/J /b7A== 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:from:references:to:subject; bh=DE18RFrLM9JnKxxgPljx5HOfe5HnQej0v1PcoNXA78Y=; b=C8iwkjhR9/FpAepmJqYNc2qLOwOW0yP+cGjEru4ZLtKPy7TpeWe3YQZQWN6I7G0zE9 ZJ0UUXPD/9afzB8Wi6o2J0CaqQCwqZaL/uGMkz+3uuvT2AQkPNiXsyzwVmRoBo6ww9fA q4yVRy5n8cO2cFJNFzyA2i3Dc5uWQe5L1fBExPivgWOzPLkKy7ZwIasxw4PkwZuRm7Ib PGS9qFdEaVBB6MPt5u68eMf4pwhvldPhlps0J4xR8cYSraMOeDvGmDjBYnIuKQB5lTxa 8l3XQFQ+Dv0zfUPt9zO90x2Ioav4vuld5BSvz/YAaCmnWBi4EPjPb9jgdHpt5oY3kyag UYfQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id i17si244700edg.2.2019.01.31.07.55.48 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 07:55:48 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id x0VFtlmX027054 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 31 Jan 2019 16:55:47 +0100 Received: from [139.25.68.37] (md1q0hnc.ad001.siemens.net [139.25.68.37] (may be forged)) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x0VFtl3P015067; Thu, 31 Jan 2019 16:55:47 +0100 Subject: Re: [PATCHv3 3/8] meta: move debianization code into a class and into dpkg-base To: "[ext] Henning Schild" , isar-users@googlegroups.com References: <20190131141816.32437-1-henning.schild@siemens.com> <20190131141816.32437-4-henning.schild@siemens.com> From: Jan Kiszka Message-ID: <7fabcd5c-a864-d7b1-b262-946254f3ec90@siemens.com> Date: Thu, 31 Jan 2019 16:55:46 +0100 User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 In-Reply-To: <20190131141816.32437-4-henning.schild@siemens.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: 7fucK6kAVOCk On 31.01.19 15:18, [ext] Henning Schild wrote: > From: Henning Schild > > This is pure restructuring. Move the code into its own class and include > that in dpkg-base, it was available only in dpkg-raw before. > > Signed-off-by: Henning Schild > --- > meta/classes/debianize.bbclass | 85 ++++++++++++++++++++++++++++++++++ > meta/classes/dpkg-base.bbclass | 1 + > meta/classes/dpkg-raw.bbclass | 83 --------------------------------- > 3 files changed, 86 insertions(+), 83 deletions(-) > create mode 100644 meta/classes/debianize.bbclass > > diff --git a/meta/classes/debianize.bbclass b/meta/classes/debianize.bbclass > new file mode 100644 > index 0000000..76b2ed3 > --- /dev/null > +++ b/meta/classes/debianize.bbclass > @@ -0,0 +1,85 @@ > +# This software is a part of ISAR. > +# Copyright (C) 2017-2019 Siemens AG Missing SPDX-Identifier (i.e. license tag). > + > +deb_add_changelog() { > + date=$( LANG=C date -R ) > + cat < ${S}/debian/changelog > +${PN} (${PV}) UNRELEASED; urgency=low > + > + * generated by Isar > + > + -- ${MAINTAINER} ${date} > +EOF > + if [ -f ${WORKDIR}/changelog ]; then > + echo >> ${S}/debian/changelog > + cat ${WORKDIR}/changelog >> ${S}/debian/changelog > + fi > +} > + > +deb_create_compat() { > + echo 9 > ${S}/debian/compat > +} > + > +deb_create_control() { > + compat=$( cat ${S}/debian/compat ) > + cat << EOF > ${S}/debian/control > +Source: ${PN} > +Section: misc > +Priority: optional > +Standards-Version: 3.9.6 > +Maintainer: ${MAINTAINER} > +Build-Depends: debhelper (>= ${compat}) > + > +Package: ${PN} > +Architecture: any > +Depends: ${DEBIAN_DEPENDS} > +Description: ${DESCRIPTION} > +EOF > +} > + > +DH_FIXPERM_EXCLUSIONS = \ > + "${@' '.join(['-X ' + x for x in \ > + (d.getVar('PRESERVE_PERMS', False) or '').split()])}" > + > +deb_create_rules() { > + cat << EOF > ${S}/debian/rules > +#!/usr/bin/make -f > + > +override_dh_fixperms: > + dh_fixperms ${DH_FIXPERM_EXCLUSIONS} > + > +%: > + dh \$@ > +EOF > + chmod +x ${S}/debian/rules > +} > + > +deb_debianize() { > + if [ -f ${WORKDIR}/compat ]; then > + install -v -m 644 ${WORKDIR}/compat ${S}/debian/compat > + else > + deb_create_compat > + fi > + if [ -f ${WORKDIR}/control ]; then > + install -v -m 644 ${WORKDIR}/control ${S}/debian/control > + else > + deb_create_control > + fi > + if [ -f ${WORKDIR}/rules ]; then > + install -v -m 755 ${WORKDIR}/rules ${S}/debian/rules > + else > + deb_create_rules > + fi > + deb_add_changelog > + > + for t in pre post > + do > + for a in inst rm > + do > + if [ -f ${WORKDIR}/${t}${a} ]; then > + install -v -m 755 ${WORKDIR}/${t}${a} \ > + ${S}/debian/${t}${a} > + fi > + done > + done > +} > diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass > index 2f324f9..175dc80 100644 > --- a/meta/classes/dpkg-base.bbclass > +++ b/meta/classes/dpkg-base.bbclass > @@ -4,6 +4,7 @@ > # SPDX-License-Identifier: MIT > > inherit buildchroot > +inherit debianize > > DEPENDS ?= "" > > diff --git a/meta/classes/dpkg-raw.bbclass b/meta/classes/dpkg-raw.bbclass > index a9143e9..0434313 100644 > --- a/meta/classes/dpkg-raw.bbclass > +++ b/meta/classes/dpkg-raw.bbclass > @@ -17,89 +17,6 @@ do_install[cleandirs] = "${D}" > do_install[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" > addtask install after do_unpack before do_prepare_build > > -deb_add_changelog() { > - date=$( LANG=C date -R ) > - cat < ${D}/debian/changelog > -${PN} (${PV}) UNRELEASED; urgency=low > - > - * generated by Isar > - > - -- ${MAINTAINER} ${date} > -EOF > - if [ -f ${WORKDIR}/changelog ]; then > - echo >> ${D}/debian/changelog > - cat ${WORKDIR}/changelog >> ${D}/debian/changelog > - fi > -} > - > -deb_create_compat() { > - echo 9 > ${D}/debian/compat > -} > - > -deb_create_control() { > - compat=$( cat ${D}/debian/compat ) > - cat << EOF > ${D}/debian/control > -Source: ${PN} > -Section: misc > -Priority: optional > -Standards-Version: 3.9.6 > -Maintainer: ${MAINTAINER} > -Build-Depends: debhelper (>= ${compat}) > - > -Package: ${PN} > -Architecture: any > -Depends: ${DEBIAN_DEPENDS} > -Description: ${DESCRIPTION} > -EOF > -} > - > -DH_FIXPERM_EXCLUSIONS = \ > - "${@' '.join(['-X ' + x for x in \ > - (d.getVar('PRESERVE_PERMS', False) or '').split()])}" > - > -deb_create_rules() { > - cat << EOF > ${S}/debian/rules > -#!/usr/bin/make -f > - > -override_dh_fixperms: > - dh_fixperms ${DH_FIXPERM_EXCLUSIONS} > - > -%: > - dh \$@ > -EOF > - chmod +x ${S}/debian/rules > -} > - > -deb_debianize() { > - if [ -f ${WORKDIR}/compat ]; then > - install -v -m 644 ${WORKDIR}/compat ${D}/debian/compat > - else > - deb_create_compat > - fi > - if [ -f ${WORKDIR}/control ]; then > - install -v -m 644 ${WORKDIR}/control ${D}/debian/control > - else > - deb_create_control > - fi > - if [ -f ${WORKDIR}/rules ]; then > - install -v -m 755 ${WORKDIR}/rules ${D}/debian/rules > - else > - deb_create_rules > - fi > - deb_add_changelog > - > - for t in pre post > - do > - for a in inst rm > - do > - if [ -f ${WORKDIR}/${t}${a} ]; then > - install -v -m 755 ${WORKDIR}/${t}${a} \ > - ${D}/debian/${t}${a} > - fi > - done > - done > -} > - > do_prepare_build[cleandirs] += "${D}/debian" > do_prepare_build() { > cd ${D} > Jan -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux