From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6753266854416875520 X-Received: by 2002:a1c:7c16:: with SMTP id x22mr5126281wmc.46.1572367468958; Tue, 29 Oct 2019 09:44:28 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a7b:ca45:: with SMTP id m5ls112311wml.1.canary-gmail; Tue, 29 Oct 2019 09:44:28 -0700 (PDT) X-Google-Smtp-Source: APXvYqxjJqoviith2Fycy+F7/7A2W74PPEznGww6acHH8O+WShRnEKuVlBVBcR6WN3RB1A1IjOg3 X-Received: by 2002:a7b:cf35:: with SMTP id m21mr215621wmg.145.1572367468451; Tue, 29 Oct 2019 09:44:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572367468; cv=none; d=google.com; s=arc-20160816; b=aCiy88MZ1cX1do5hmuqM4fMTUbRudsR9YJzFXPND72zc/OtwLK5GxJN1i5OxhG7iVJ W4FP7jUXXUfk//BeBx1yXoHdRBlo5kIuaSacbiqglfJSmnG57C3A1MhXYxKgzRux1Et8 EO4Gw7kSCU8keOxJfThjr2v/YUm8i6M5v8GFOExhQfV+EUN5CFcOPLaJxp3L4ITIAaus OodQuo7RdjEBt7tC0qdTx70Z+EOB9NNjAd68bqQE75rz+BWnQNlItS9MQy2k5s4VPVKK z7Nq0ttEojbK6ppERJzwYDke+II9o9AEMgbNzSFu8F0XL8QjmA3a/SJm7zP7UFo7JztX 28Wg== 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=auZ7QJizNTvrkJxJ2gzYyi5Dcu8edSPXjcdMMc7skYg=; b=hdxaSbSSPr156ylVrHmNTSLDVzye0O6rd4D42cnDDsdShD01bOgmw79du8PDFXKGVw Sp+Sra2FHKHXFZYVfvS7c21FMg0JQJo/heOVCox27CXkO+XNEdJUeRgwYLkvF8woi4UI fbwiSvZwr6H5530ziNMbM5aJGM/WxNmkoqHQuwQ+SaPZ0mfYFaCmOPL2PweyLFfEtod4 GAGDHo+ezzuLI4anW0+EnNx5suQevdR6Qe8p5v8ClX9sUhKeYt+JRQPcEkXe11IooIdW j2/vuy7mHGMg8e16JY8DCWAR0mYVCsBqoomwbCmAA3H5NACqW7U76BQWNEe3O0lAe5mv n+Xg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id x8si155812wmk.2.2019.10.29.09.44.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Oct 2019 09:44:28 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@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 henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=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 x9TGiShQ000565 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 29 Oct 2019 17:44:28 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.69.153]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x9TGiQpk006586; Tue, 29 Oct 2019 17:44:26 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: "Dalamagkidis, Konstantinos" , "Jan Kiszka" , Henning Schild Subject: [PATCH 4/5] doc: write something about "debianize" Date: Tue, 29 Oct 2019 17:44:23 +0100 Message-Id: <20191029164424.14681-5-henning.schild@siemens.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191029164424.14681-1-henning.schild@siemens.com> References: <20191029164424.14681-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: VdKpHXhAwjPU From: Henning Schild Also add some comments to the implementation and extend the example recipe with some pre- and post-processing. Signed-off-by: Henning Schild --- doc/user_manual.md | 19 ++++++++++++++++++- .../recipes-app/samefile/samefile_2.14.bb | 14 ++++++++++++++ meta/classes/debianize.bbclass | 6 ++++++ 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/doc/user_manual.md b/doc/user_manual.md index 34f50df..7c23fcc 100644 --- a/doc/user_manual.md +++ b/doc/user_manual.md @@ -583,7 +583,7 @@ Isar currently supports two ways of creating custom packages. The `deb` packages are built using `dpkg-buildpackage`, so the sources should contain the `debian` directory with necessary meta information. This way is the default way of adding software that needs to be compiled from source. The bbclass for this approach is called `dpkg`. -**NOTE:** If the sources do not contain a `debian` directory your recipe can fetch, create, or ship that. +**NOTE:** If the sources do not contain a `debian` directory your recipe can fetch, create, or ship that. You might want to read the the next section before returning here. This is also what you do if you want to rebuild/modify an upstream package. Isar does understand `SRC_URI` entries starting with "apt://". For an example @@ -624,6 +624,23 @@ This approach prevents duplication of the license files in different packages. The last line in the example above adds recipe to the Isar work chain. +### Compilation of sources missing the debian/-directory + +The `debian` directory contains meta information on how to build a package from source. This is roughly speaking "configure", "compile", "install" all described in a Debian-specific way. +Isar expects your sources to contain the `debian` folder and the above steps need to be described in it, not in a task in a recipe. + +So once you have sources you always need to combine them with a `debian` folder before Isar can build a package for you. +You might be able to find a debianization for a component on the internet, i.e. Ubuntu does package an open source component while Debian does not. Your recipe could download the `debian` folder from Ubuntu and the sources from the open source project. + +You can write it yourself, which can be pretty easy but requires a bit of studying. + +Isar does actually contain a helper that aims to "debianize" sources for your. If your package uses a build-system that Debian knows and follows the well known "configure", "compile", "install" scheme that debianization might just fit your needs without reading Debian manuals. +If it does not fully fit your needs, it probably gives you a good starting point for your manual tuning. + +The shell function `deb_debianize` creates a `debian` folder. But it will not overwrite files that already are in WORKDIR. So you can either just call it to fully generate the `debian` folder. Or you combine it with pre-existing parts. + +Have a look at meta-isar/recipes-app/samefile/samefile_2.14.bb and meta/classes/debianize.bbclass for an example and the implementation. + ### Packages without source If your customization is not about compiling from source there is a second way of creating `deb` packages. That way can be used for cases like: diff --git a/meta-isar/recipes-app/samefile/samefile_2.14.bb b/meta-isar/recipes-app/samefile/samefile_2.14.bb index a24d574..0ace85a 100644 --- a/meta-isar/recipes-app/samefile/samefile_2.14.bb +++ b/meta-isar/recipes-app/samefile/samefile_2.14.bb @@ -12,5 +12,19 @@ SRC_URI[md5sum] = "0b438249f3549f18b49cbb49b0473f70" do_prepare_build[cleandirs] += "${S}/debian" do_prepare_build() { + # you could also create parts of your debianization before + # pre-exisiting files will not be recreated + # 42 is not actually valid ... this is just a stupid example + echo 42 > "${WORKDIR}"/compat + + # this step creates everything dpkg-buildpackage needs, compat will not be + # overwritten deb_debianize + + # now if you are not happy you can post-process the result + # now let us "repair" the compat + echo 9 > "${S}/debian/compat" + # compat happens to be used by this step, so do that again + # see debianize.bbclass + deb_create_control } diff --git a/meta/classes/debianize.bbclass b/meta/classes/debianize.bbclass index fb9c234..e1c79ab 100644 --- a/meta/classes/debianize.bbclass +++ b/meta/classes/debianize.bbclass @@ -76,23 +76,29 @@ EOF } deb_debianize() { + # create the compat-file if there is no file with that name in WORKDIR if [ -f ${WORKDIR}/compat ]; then install -v -m 644 ${WORKDIR}/compat ${S}/debian/compat else deb_create_compat fi + # create the control-file if there is no contro-file in WORKDIR if [ -f ${WORKDIR}/control ]; then install -v -m 644 ${WORKDIR}/control ${S}/debian/control else deb_create_control fi + # create rules if WORKDIR does not contain a rules-file if [ -f ${WORKDIR}/rules ]; then install -v -m 755 ${WORKDIR}/rules ${S}/debian/rules else deb_create_rules fi + # prepend a changelog-entry unless an existing changelog file already + # contains an entry with CHANGELOG_V deb_add_changelog + # copy all hooks from WORKDIR into debian/, hooks are not generated for t in pre post do for a in inst rm -- 2.23.0