From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6935499186756386816 Date: Wed, 3 Mar 2021 10:40:59 -0800 (PST) From: "vijaikumar....@gmail.com" To: isar-users Message-Id: In-Reply-To: <20210303183823.11563-1-Vijaikumar_Kanagarajan@mentor.com> References: <20210303183823.11563-1-Vijaikumar_Kanagarajan@mentor.com> Subject: Re: [PATCH v2] dpkg-base: Introduce do_apt_unpack MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_2956_343739720.1614796859165" X-TUID: Yzs/oD7ITp3I ------=_Part_2956_343739720.1614796859165 Content-Type: multipart/alternative; boundary="----=_Part_2957_759121443.1614796859165" ------=_Part_2957_759121443.1614796859165 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit CI build going on here: http://ci.isar-build.org:8080/job/isar_vkk_devel/92/ On Thursday, March 4, 2021 at 12:08:59 AM UTC+5:30 vijaikumar_...@mentor.com wrote: > The Debian source package fetch and unpacking happens now inside the > do_apt_fetch task. > > With the current do_apt_fetch implementation, it is not possible to use > a custom source directory(${S}). > apt-get source by default extracts the contents of the debian source > into folder with name _. > > Add provision for specifying a custom source directory. > > Add a new task called do_apt_unpack and move unpacking logic there. > > Signed-off-by: Vijai Kumar K > --- > meta/classes/dpkg-base.bbclass | 24 +++++++++++++++++++++--- > 1 file changed, 21 insertions(+), 3 deletions(-) > > diff --git a/meta/classes/dpkg-base.bbclass > b/meta/classes/dpkg-base.bbclass > index 5c7bddc..a6c2e3b 100644 > --- a/meta/classes/dpkg-base.bbclass > +++ b/meta/classes/dpkg-base.bbclass > @@ -58,7 +58,6 @@ do_apt_fetch() { > if [ -z "${@d.getVar("SRC_APT", True).strip()}" ]; then > return 0 > fi > - rm -rf ${S} > dpkg_do_mounts > E="${@ isar_export_proxies(d)}" > sudo -E chroot ${BUILDCHROOT_DIR} /usr/bin/apt-get update \ > @@ -69,8 +68,6 @@ do_apt_fetch() { > for uri in "${SRC_APT}"; do > sudo -E chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} \ > sh -c 'mkdir -p /downloads/deb-src/"$1"/"$2" && cd > /downloads/deb-src/"$1"/"$2" && apt-get -y --download-only --only-source > source "$2"' my_script "${DISTRO}" "${uri}" > - sudo -E chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} \ > - sh -c 'cp /downloads/deb-src/"$1"/"$2"/* ${PP} && cd ${PP} && apt-get -y > --only-source source "$2"' my_script "${DISTRO}" "${uri}" > done > > dpkg_undo_mounts > @@ -79,6 +76,27 @@ do_apt_fetch() { > addtask apt_fetch after do_unpack before do_patch > do_apt_fetch[lockfiles] += "${REPO_ISAR_DIR}/isar.lock" > > +do_apt_unpack() { > + rm -rf ${S} > + dpkg_do_mounts > + E="${@ isar_export_proxies(d)}" > + > + for uri in "${SRC_APT}"; do > + sudo -E chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} \ > + sh -c ' \ > + set -e > + dscfile="$(apt-get -y -qq --print-uris source "${2}" | cut -d " " -f2 | > grep -E "*.dsc")" > + cd ${PP} > + cp /downloads/deb-src/"${1}"/"${2}"/* ${PP} > + dpkg-source -x "${dscfile}" "${PPS}"' \ > + my_script "${DISTRO}" "${uri}" > + done > + > + dpkg_undo_mounts > +} > + > +addtask apt_unpack after do_apt_fetch before do_patch > + > addtask cleanall_apt before do_cleanall > do_cleanall_apt[nostamp] = "1" > do_cleanall_apt() { > -- > 2.17.1 > > ------=_Part_2957_759121443.1614796859165 Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: 7bit CI build going on here: http://ci.isar-build.org:8080/job/isar_vkk_devel/92/

On Thursday, March 4, 2021 at 12:08:59 AM UTC+5:30 vijaikumar_...@mentor.com wrote:
The Debian source package fetch and unpacking happens now inside the
do_apt_fetch task.

With the current do_apt_fetch implementation, it is not possible to use
a custom source directory(${S}).
apt-get source by default extracts the contents of the debian source
into folder with name <pkg>_<version>.

Add provision for specifying a custom source directory.

Add a new task called do_apt_unpack and move unpacking logic there.

Signed-off-by: Vijai Kumar K <Vijaikumar_...@mentor.com>
---
meta/classes/dpkg-base.bbclass | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass
index 5c7bddc..a6c2e3b 100644
--- a/meta/classes/dpkg-base.bbclass
+++ b/meta/classes/dpkg-base.bbclass
@@ -58,7 +58,6 @@ do_apt_fetch() {
if [ -z "${@d.getVar("SRC_APT", True).strip()}" ]; then
return 0
fi
- rm -rf ${S}
dpkg_do_mounts
E="${@ isar_export_proxies(d)}"
sudo -E chroot ${BUILDCHROOT_DIR} /usr/bin/apt-get update \
@@ -69,8 +68,6 @@ do_apt_fetch() {
for uri in "${SRC_APT}"; do
sudo -E chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} \
sh -c 'mkdir -p /downloads/deb-src/"$1"/"$2" && cd /downloads/deb-src/"$1"/"$2" && apt-get -y --download-only --only-source source "$2"' my_script "${DISTRO}" "${uri}"
- sudo -E chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} \
- sh -c 'cp /downloads/deb-src/"$1"/"$2"/* ${PP} && cd ${PP} && apt-get -y --only-source source "$2"' my_script "${DISTRO}" "${uri}"
done

dpkg_undo_mounts
@@ -79,6 +76,27 @@ do_apt_fetch() {
addtask apt_fetch after do_unpack before do_patch
do_apt_fetch[lockfiles] += "${REPO_ISAR_DIR}/isar.lock"

+do_apt_unpack() {
+ rm -rf ${S}
+ dpkg_do_mounts
+ E="${@ isar_export_proxies(d)}"
+
+ for uri in "${SRC_APT}"; do
+ sudo -E chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} \
+ sh -c ' \
+ set -e
+ dscfile="$(apt-get -y -qq --print-uris source "${2}" | cut -d " " -f2 | grep -E "*.dsc")"
+ cd ${PP}
+ cp /downloads/deb-src/"${1}"/"${2}"/* ${PP}
+ dpkg-source -x "${dscfile}" "${PPS}"' \
+ my_script "${DISTRO}" "${uri}"
+ done
+
+ dpkg_undo_mounts
+}
+
+addtask apt_unpack after do_apt_fetch before do_patch
+
addtask cleanall_apt before do_cleanall
do_cleanall_apt[nostamp] = "1"
do_cleanall_apt() {
--
2.17.1

------=_Part_2957_759121443.1614796859165-- ------=_Part_2956_343739720.1614796859165--