From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6661145085876371456 X-Received: by 2002:a2e:9194:: with SMTP id f20mr476789ljg.21.1550918697282; Sat, 23 Feb 2019 02:44:57 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:5551:: with SMTP id j78ls1032256ljb.11.gmail; Sat, 23 Feb 2019 02:44:56 -0800 (PST) X-Google-Smtp-Source: AHgI3IbbXTFXgh03N051+s9dgZBypkqbe7FlJNSeKMSAhHfIuoeJYWozaTjAH76driheJUw0Hy9m X-Received: by 2002:a2e:4253:: with SMTP id p80-v6mr484514lja.13.1550918696732; Sat, 23 Feb 2019 02:44:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550918696; cv=none; d=google.com; s=arc-20160816; b=Hp2AT7/6vL7Y5msSzzLZLUy2VLIFl2R9DsJh0KZW/MzjchtsrBqQDiMEPm6bb/7U3a SiYX3w9DA+ApzGaPcPzlmfskvVBBly7lAJeNt58OOOX6E+vbZ6etAEUN7eLJGJpJg85I XE3CGQC8IMZmkdObLcdlDbzrQAR7YvNshGqlpGwKOx7R81mviWB1vlyLNsMN1WQso4eD 7mNwAdbjUGElsf4iLcIV8VI6Aev81qqcrX2hlj+BdLf5sASlNy0+OF2vMhQpMNBERKga vAi3oXFq8ao80dqZ+nnJuNgzrXm3Ol1imHKv+Jz/BoWrDVTmYqOmIC7jgfI3UlJxiChW cifw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:mime-version:user-agent :date:message-id:subject:from:cc:to:dkim-signature; bh=U2eD9joOEZ56UqjIQYjnXG2+f4uk4kmN5elrDfYkmv8=; b=tjrkxyBDFVwpYCmyWySFCTreE1OKJJG7Oau7UkEM24TlBfWmb6D67sqqDwwN227NnW /F0kV2HJn8VRxTarmtFq9nF63hQ8pAaCrf4CsBYtjw4TroDBBfjClMXeJa9DbIndLI2Q 9Eoa1s3PHI+FkwAaj7l9WUOecG99wF1xV+gGFLxr8kwl4UMMLlCplemNeP4mGAq6dGlh 0Ax0SCmJz+RF0OIKfEBidTz+pxOvC9XAKjhRVlTvsKlbWRpHzNR00LQg//T/7yan1kon OHm5SctsFWZ57HiEw1fU127iCneRtiFsHCNIeWvQDk23sIelbr5FuBzGJMnSCxIztkec +vNw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@web.de header.s=dbaedf251592 header.b=Yjb2wqSs; spf=pass (google.com: domain of jan.kiszka@web.de designates 212.227.15.14 as permitted sender) smtp.mailfrom=jan.kiszka@web.de Return-Path: Received: from mout.web.de (mout.web.de. [212.227.15.14]) by gmr-mx.google.com with ESMTPS id c17si163024lff.1.2019.02.23.02.44.56 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 23 Feb 2019 02:44:56 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@web.de designates 212.227.15.14 as permitted sender) client-ip=212.227.15.14; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@web.de header.s=dbaedf251592 header.b=Yjb2wqSs; spf=pass (google.com: domain of jan.kiszka@web.de designates 212.227.15.14 as permitted sender) smtp.mailfrom=jan.kiszka@web.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1550918696; bh=jq8jLow4ZjQkwVNm0lLoVr14no3yJcPtM5bVLZqFtmQ=; h=X-UI-Sender-Class:To:Cc:From:Subject:Date; b=Yjb2wqSs36PB9kxcqa31Ke224z4Ho+IAxxSW/zW1HCRFHm7eJ73n+B/PseVBWk59E Etg25W6wIuT03YQfCIJI9CKSfQvJrOXPwl1ibZrydJU19uP0AiYsNFRqz5kiyA8Uff mgcmBJxeB5rGrZ1GTLkgofmnzTOrbk9IBAKRSDuA= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from [192.168.1.10] ([95.157.57.47]) by smtp.web.de (mrweb003 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MDxFv-1gnrU83lVP-00HQjx; Sat, 23 Feb 2019 11:44:55 +0100 To: isar-users Cc: Henning Schild From: Jan Kiszka Subject: [PATCH] Merge patch and unpack tasks Message-ID: Date: Sat, 23 Feb 2019 11:44:55 +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 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:uTULzCklfXA6LdR/rpXB6TanTaJz9eVcmBCDDwWVzkAMgbD8RtB vHl5ew4zZQ3uPjPrJgTs02KFreGpI/W4wETw5fMIMGOOO0zLCnHx59tRHdABu+WSduI8ZT/ 5OJsOjzGj1QJdgEykrj28WOMTllypxt2OglI1GuNu9lI+dA89H2fIqvd4FWYlv5wzbNzVnZ +33eo0jfXSOpP2OMMhezQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:6U2QRfi2Ais=:Pgi6jTwINEDTSC/xUV7cxL I0n4MLVA2W0B58qbOMB+tr76I7FGomibuOeRAeX1qJo/uBxOC2n/egFE12OqQEgfLKisLrB7g i9m+XXLHaEYI1rfP8vZSLszycgLsL/Bw5ITmzPaD9k5t2g2A8j0PxSnuoF3dvPpxw6QGuhVyC lDUHeIt/VHbuBlRoz8Hl/Jvh2yFzuHLmeng5ZvUrtXdDvEZ7MsUy4Hy5LZAXudqHkm9jSnpuO v2lcF1/n7fy3CcZiZ0LorSiviG0ydd8QslUflsmgXEgXX8zv5lf5Dis+cZ4czqTEub250dmIa c9PonxZt2Vi9GFA9WH6nQCalrLpabMukuWextD47m/7Z13CY7YYxlcyQBlBvYx4WOOdiirodv na2ICX3tCkWDVkojOLCGRNUPWi3+liD6NKNRkTI1uFD+CZUwKs2dOsiYvumHqia12K8rOJ15c ypOTAoPu9q6NLPogl0zwPSzdvhnnwXdoE55iq65NzW0mmpk5YCtmNfjcCRMKC8JwPFeHPbp+7 fXEyt7MGNOA3LczDUwiHtq3HlL1AaXL9GxvkNphx0KP0qUO/2qUkW1givcPDT2O3RCn41cPrR JiqLCOt+1zs6ivOpWHN4MqHhse7q4pcr80EJiytM8AaKZ+wsb3FhJDQnqXM4BXbOmHg3IWDRV /UsSfKHyA33sVSZAQSNQ5xYeIkCkXbYoDOnaLREV5NYAC55pICawf/kDKFMvJUBHPXv1HMgCv xgqLENxNfyB0ur4z4bJPT0vqPZ7cRjaeJknRMLRua06BA7bpzQV2ls3OLcKQDooNZQp2xF3Lg 51IRxbJ2ZoRZe304NsrcYYk4G8aPsQgvt96dwZzCSU3bjKIgoT9mH/FjB08HLRtTW1sxpPAuz sq9GpoZi6G2vUp5rB7i46GRfzrA4d+O+jeSAoGBeysCOjmQatYjZpjq5TR00/NGGWOu9Kicpt DUuH/CM30qw== X-TUID: m9yfJJ2QUJzb From: Jan Kiszka Our patch implementations does not support rolling back previously applied patches, thus fails on patch updates without a rerun of unpack. Avoid this by moving both steps into the same task. Signed-off-by: Jan Kiszka =2D-- meta/classes/base.bbclass | 47 +++++++++++++++++= +---- meta/classes/dpkg-base.bbclass | 9 ++--- meta/classes/dpkg-raw.bbclass | 2 +- meta/classes/fit-img.bbclass | 2 +- meta/classes/image.bbclass | 2 +- meta/classes/patch.bbclass | 33 --------------- meta/classes/template.bbclass | 2 +- meta/classes/ubi-img.bbclass | 2 +- .../isar-bootstrap/isar-bootstrap-host.bb | 2 +- .../isar-bootstrap/isar-bootstrap-target.bb | 2 +- .../recipes-core/isar-bootstrap/isar-bootstrap.inc | 2 +- meta/recipes-devtools/isar-apt/isar-apt.bb | 2 +- .../isar-cfg-localepurge/isar-cfg-localepurge.bb | 2 +- 13 files changed, 52 insertions(+), 57 deletions(-) delete mode 100644 meta/classes/patch.bbclass diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 4279a68..7bdaf37 100644 =2D-- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -1,4 +1,5 @@ # Copyright (C) 2003 Chris Larson +# Copyright (c) Siemens AG, 2018 # # Permission is hereby granted, free of charge, to any person obtaining a # copy of this software and associated documentation files (the "Software= "), @@ -17,6 +18,8 @@ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. +# +# SPDX-License-Identifier: MIT THISDIR =3D "${@os.path.dirname(d.getVar('FILE', True))}" @@ -135,25 +138,53 @@ python do_fetch() { addtask fetch before do_build -do_unpack[dirs] =3D "${WORKDIR}" -do_unpack[stamp-extra-info] =3D "${DISTRO}-${DISTRO_ARCH}" +do_unpack_and_patch[dirs] =3D "${WORKDIR}" +do_unpack_and_patch[stamp-extra-info] =3D "${DISTRO}-${DISTRO_ARCH}" -# Unpack package and put it into working directory -python do_unpack() { - src_uri =3D (d.getVar('SRC_URI', True) or "").split() - if len(src_uri) =3D=3D 0: +# Unpack package, put it into working directory, and apply potential patc= hes +python do_unpack_and_patch() { + import subprocess + + src_uris =3D (d.getVar('SRC_URI', True) or "").split() + if len(src_uris) =3D=3D 0: return rootdir =3D d.getVar('WORKDIR', True) + src_dir =3D d.getVar("S", True) + # unpack src_uris try: - fetcher =3D bb.fetch2.Fetch(src_uri, d) + fetcher =3D bb.fetch2.Fetch(src_uris, d) fetcher.unpack(rootdir) except bb.fetch2.BBFetchException as e: raise bb.build.FuncFailed(e) + + # apply patches + for src_uri in src_uris: + try: + fetcher =3D bb.fetch2.Fetch([src_uri], d) + + apply =3D fetcher.ud[src_uri].parm.get("apply") + if apply =3D=3D "no": + continue + + basename =3D fetcher.ud[src_uri].basename or "" + if not (basename.endswith(".patch") or apply =3D=3D "yes"): + continue + + striplevel =3D fetcher.ud[src_uri].parm.get("striplevel") or = "1" + + cmd =3D "patch --no-backup-if-mismatch -p " + striplevel + \ + " --directory " + src_dir + \ + " --input " + rootdir + '/' + basename + bb.note(cmd) + if subprocess.call(cmd, shell=3DTrue) !=3D 0: + bb.fatal("patching failed") + except bb.fetch2.BBFetchException as e: + raise bb.build.FuncFailed(e) } -addtask unpack after do_fetch before do_build +addtask unpack_and_patch after do_fetch before do_build addtask build do_build[dirs] =3D "${TOPDIR}" diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbcla= ss index 742b8ad..8ef1f06 100644 =2D-- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -15,12 +15,9 @@ do_adjust_git() { fi } -addtask adjust_git after do_unpack before do_patch +addtask adjust_git after do_unpack_and_patch before do_prepare_build do_adjust_git[stamp-extra-info] =3D "${DISTRO}-${DISTRO_ARCH}" -inherit patch -addtask patch after do_adjust_git before do_build - SRC_APT ?=3D "" do_apt_fetch[depends] =3D "buildchroot-target:do_build" @@ -40,7 +37,7 @@ do_apt_fetch() { dpkg_undo_mounts } -addtask apt_fetch after do_unpack before do_patch +addtask apt_fetch before do_unpack_and_patch do_apt_fetch[lockfiles] +=3D "${REPO_ISAR_DIR}/isar.lock" do_apt_fetch[stamp-extra-info] =3D "${DISTRO}-${DISTRO_ARCH}" @@ -64,7 +61,7 @@ do_prepare_build() { true } -addtask prepare_build after do_patch do_transform_template before do_buil= d +addtask prepare_build after do_unpack_and_patch do_transform_template bef= ore do_build do_prepare_build[stamp-extra-info] =3D "${DISTRO}-${DISTRO_ARCH}" # If Isar recipes depend on each other, they typically need the package # deployed to isar-apt diff --git a/meta/classes/dpkg-raw.bbclass b/meta/classes/dpkg-raw.bbclass index ea03ea4..e63ba1d 100644 =2D-- a/meta/classes/dpkg-raw.bbclass +++ b/meta/classes/dpkg-raw.bbclass @@ -17,7 +17,7 @@ do_install() { do_install[cleandirs] =3D "${D}" do_install[stamp-extra-info] =3D "${DISTRO}-${DISTRO_ARCH}" -addtask install after do_unpack before do_prepare_build +addtask install after do_unpack_and_patch before do_prepare_build do_prepare_build[cleandirs] +=3D "${D}/debian" do_prepare_build() { diff --git a/meta/classes/fit-img.bbclass b/meta/classes/fit-img.bbclass index edca09f..97f1d1a 100644 =2D-- a/meta/classes/fit-img.bbclass +++ b/meta/classes/fit-img.bbclass @@ -29,4 +29,4 @@ do_fit_image() { sudo chroot ${BUILDCHROOT_DIR} /usr/bin/mkimage ${MKIMAGE_ARGS} \ -f '${PP_WORK}/${FIT_IMAGE_SOURCE}' '${PP_DEPLOY}/${FIT_I= MAGE_FILE}' } -addtask fit_image before do_build after do_copy_boot_files do_install_ima= ger_deps do_unpack do_transform_template +addtask fit_image before do_build after do_copy_boot_files do_install_ima= ger_deps do_unpack_and_patch do_transform_template diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 574fb46..a5952eb 100644 =2D-- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -92,7 +92,7 @@ do_rootfs() { die "No root filesystem function defined, please implement in your re= cipe" } -addtask rootfs before do_build after do_unpack +addtask rootfs before do_build after do_unpack_and_patch do_rootfs[deptask] =3D "do_deploy_deb" do_mark_rootfs() { diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass deleted file mode 100644 index 0bc449f..0000000 =2D-- a/meta/classes/patch.bbclass +++ /dev/null @@ -1,33 +0,0 @@ -# This software is a part of ISAR. -# Copyright (c) Siemens AG, 2018 - -python do_patch() { - import subprocess - - workdir =3D d.getVar("WORKDIR", True) + "/" - src_dir =3D d.getVar("S", True) - - for src_uri in (d.getVar("SRC_URI", True) or "").split(): - try: - fetcher =3D bb.fetch2.Fetch([src_uri], d) - - apply =3D fetcher.ud[src_uri].parm.get("apply") - if apply =3D=3D "no": - continue - - basename =3D fetcher.ud[src_uri].basename or "" - if not (basename.endswith(".patch") or apply =3D=3D "yes"): - continue - - striplevel =3D fetcher.ud[src_uri].parm.get("striplevel") or = "1" - - cmd =3D "patch --no-backup-if-mismatch -p " + striplevel + \ - " --directory " + src_dir + " --input " + workdir + bas= ename - bb.note(cmd) - if subprocess.call(cmd, shell=3DTrue) !=3D 0: - bb.fatal("patching failed") - except bb.fetch2.BBFetchException as e: - raise bb.build.FuncFailed(e) -} - -do_patch[stamp-extra-info] =3D "${DISTRO}-${DISTRO_ARCH}" diff --git a/meta/classes/template.bbclass b/meta/classes/template.bbclass index 324511a..8846ab0 100644 =2D-- a/meta/classes/template.bbclass +++ b/meta/classes/template.bbclass @@ -59,4 +59,4 @@ python do_transform_template() { if process.wait() !=3D 0: bb.fatal("processing of template failed") } -addtask do_transform_template after do_unpack +addtask do_transform_template after do_unpack_and_patch diff --git a/meta/classes/ubi-img.bbclass b/meta/classes/ubi-img.bbclass index f61a940..f06ab04 100644 =2D-- a/meta/classes/ubi-img.bbclass +++ b/meta/classes/ubi-img.bbclass @@ -32,4 +32,4 @@ do_ubi_image() { sudo chroot ${BUILDCHROOT_DIR} /usr/sbin/ubinize ${UBINIZE_ARGS} \ -o '${PP_DEPLOY}/${UBI_IMAGE_FILE}' '${PP_WORK}/${UBINIZE= _CFG}' } -addtask ubi_image before do_build after do_copy_boot_files do_install_ima= ger_deps do_unpack do_transform_template +addtask ubi_image before do_build after do_copy_boot_files do_install_ima= ger_deps do_unpack_and_patch do_transform_template diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb b/met= a/recipes-core/isar-bootstrap/isar-bootstrap-host.bb index a793585..da6d5e1 100644 =2D-- a/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb @@ -40,7 +40,7 @@ python do_apt_config_prepare() { aggregate_files(d, apt_sources_list, apt_sources_init_out) aggregate_aptsources_list(d, apt_sources_list, apt_sources_out) } -addtask apt_config_prepare before do_bootstrap after do_unpack +addtask apt_config_prepare before do_bootstrap after do_unpack_and_patch OVERRIDES_append =3D ":${@get_distro_needs_https_support(d, True)}" diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap-target.bb b/m= eta/recipes-core/isar-bootstrap/isar-bootstrap-target.bb index bec6fa8..b338adf 100644 =2D-- a/meta/recipes-core/isar-bootstrap/isar-bootstrap-target.bb +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap-target.bb @@ -39,7 +39,7 @@ python do_apt_config_prepare() { aggregate_files(d, apt_sources_list, apt_sources_init_out) aggregate_aptsources_list(d, apt_sources_list, apt_sources_out) } -addtask apt_config_prepare before do_bootstrap after do_unpack +addtask apt_config_prepare before do_bootstrap after do_unpack_and_patch OVERRIDES_append =3D ":${@get_distro_needs_https_support(d, False)}" diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/re= cipes-core/isar-bootstrap/isar-bootstrap.inc index 234d339..15995d4 100644 =2D-- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -184,7 +184,7 @@ do_generate_keyring() { done fi } -addtask generate_keyring before do_build after do_unpack +addtask generate_keyring before do_build after do_unpack_and_patch diff --git a/meta/recipes-devtools/isar-apt/isar-apt.bb b/meta/recipes-dev= tools/isar-apt/isar-apt.bb index a959691..aea7ff7 100644 =2D-- a/meta/recipes-devtools/isar-apt/isar-apt.bb +++ b/meta/recipes-devtools/isar-apt/isar-apt.bb @@ -26,4 +26,4 @@ do_cache_config() { fi } -addtask cache_config after do_unpack before do_build +addtask cache_config after do_unpack_and_patch before do_build diff --git a/meta/recipes-support/isar-cfg-localepurge/isar-cfg-localepurg= e.bb b/meta/recipes-support/isar-cfg-localepurge/isar-cfg-localepurge.bb index 62b4b2d..b231e1b 100644 =2D-- a/meta/recipes-support/isar-cfg-localepurge/isar-cfg-localepurge.bb +++ b/meta/recipes-support/isar-cfg-localepurge/isar-cfg-localepurge.bb @@ -55,7 +55,7 @@ do_gen_config() { ${@get_nopurge(d)} __EOF__ } -addtask gen_config after do_unpack before do_install +addtask gen_config after do_unpack_and_patch before do_install do_install() { install -v -d ${D}/usr/lib/${PN} =2D- 2.16.4