Re: [PATCH v3 1/2] rootfs: Make rootfs finalize a separate task

[vijai kumar <vijaikumar.kanagarajan@gmail.com>]

On Wed, Mar 11, 2020 at 12:46 PM vijai kumar
<vijaikumar.kanagarajan@gmail.com> wrote:
>
> As said before, this series, atleast the second patch, depends on Henning's base-apt series.
>
> I am going to rebase my changes on top of Hennings v5 and test it out.
>
> Also, should we have these changes as part of Hennings series? Or should I wait for
> the series to get in and address these later?
>
Hi All,

While testing this series on top of the current next I got the below
error. Any pointers? I am yet to try a local build.

Failed to fetch
http://deb.debian.org/debian/pool/main/g/gettext/gettext_0.19.8.1.orig.tar.xz
 Writing more data than expected (7210080 > 7209808)

   Hashes of expected file:
    - SHA256:105556dbc5c3fbbc2aa0edb46d22d055748b6f5c7cd7a8d99f8e7eb84e938be4
    - Filesize:7209808 [weak]

    - MD5Sum:df3f5690eaa30fd228537b00cb7b7590 [weak]
E: Failed to fetch some archives.

http://ci.isar-build.org:8080/job/isar_vkk_devel/40/consoleFull

Also, there are some more fixes, to strip the version info from Source
field, so v4 is in pipeline.

Thanks,
Vijai Kumar K


> Thanks,
> Vijai Kumar K
>
> On Friday, February 14, 2020 at 11:18:11 AM UTC+5:30, vijai kumar wrote:
>>
>> With the current implementation it is difficult to append a
>> postprocess function which requires a chroot environment.
>> For example, to add a postprocess function which runs apt-get to
>> download all source of packages installed in the target.
>>
>> rootfs_postprocess_finalize is not actually an optional feature
>> but instead a necessary cleanup function for image class.
>> So, move the implementation to image class and make it as a task.
>>
>> Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
>> ---
>> Changes in v3:
>>  - Take care of non-existent downloads/deb-src directory.
>>
>>  meta/classes/image.bbclass  | 41 ++++++++++++++++++++++++++++++++++++-
>>  meta/classes/rootfs.bbclass | 39 -----------------------------------
>>  2 files changed, 40 insertions(+), 40 deletions(-)
>>
>> diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
>> index cfd617a..c5fddba 100644
>> --- a/meta/classes/image.bbclass
>> +++ b/meta/classes/image.bbclass
>> @@ -60,7 +60,7 @@ image_do_mounts() {
>>  }
>>
>>  ROOTFSDIR = "${IMAGE_ROOTFS}"
>> -ROOTFS_FEATURES += "clean-package-cache finalize-rootfs generate-manifest"
>> +ROOTFS_FEATURES += "copy-package-cache clean-package-cache generate-manifest"
>>  ROOTFS_PACKAGES += "${IMAGE_PREINSTALL} ${IMAGE_INSTALL}"
>>  ROOTFS_MANIFEST_DEPLOY_DIR ?= "${DEPLOY_DIR_IMAGE}"
>>
>> @@ -168,5 +168,44 @@ python do_deploy() {
>>  }
>>  addtask deploy before do_build after do_image
>>
>> +do_rootfs_finalize() {
>> +    sudo -s <<'EOSUDO'
>> +        test -e "${ROOTFSDIR}/chroot-setup.sh" && \
>> +            "${ROOTFSDIR}/chroot-setup.sh" "cleanup" "${ROOTFSDIR}"
>> +        rm -f "${ROOTFSDIR}/chroot-setup.sh"
>> +
>> +        test ! -e "${ROOTFSDIR}/usr/share/doc/qemu-user-static" && \
>> +            find "${ROOTFSDIR}/usr/bin" \
>> +                -maxdepth 1 -name 'qemu-*-static' -type f -delete
>> +
>> +        mountpoint -q '${ROOTFSDIR}/isar-apt' && \
>> +            umount -l ${ROOTFSDIR}/isar-apt
>> +        rmdir --ignore-fail-on-non-empty ${ROOTFSDIR}/isar-apt
>> +
>> +        mountpoint -q '${ROOTFSDIR}/base-apt' && \
>> +            umount -l ${ROOTFSDIR}/base-apt
>> +        rmdir --ignore-fail-on-non-empty ${ROOTFSDIR}/base-apt
>> +
>> +        mountpoint -q '${ROOTFSDIR}/dev' && \
>> +            umount -l ${ROOTFSDIR}/dev
>> +        mountpoint -q '${ROOTFSDIR}/sys' && \
>> +            umount -l ${ROOTFSDIR}/proc
>> +        mountpoint -q '${ROOTFSDIR}/sys' && \
>> +            umount -l ${ROOTFSDIR}/sys
>> +
>> +        rm -f "${ROOTFSDIR}/etc/apt/apt.conf.d/55isar-fallback.conf"
>> +
>> +        rm -f "${ROOTFSDIR}/etc/apt/sources.list.d/isar-apt.list"
>> +        rm -f "${ROOTFSDIR}/etc/apt/preferences.d/isar-apt"
>> +        rm -f "${ROOTFSDIR}/etc/apt/sources.list.d/base-apt.list"
>> +
>> +        mv "${ROOTFSDIR}/etc/apt/sources-list" \
>> +            "${ROOTFSDIR}/etc/apt/sources.list.d/bootstrap.list"
>> +
>> +        rm -f "${ROOTFSDIR}/etc/apt/sources-list"
>> +EOSUDO
>> +}
>> +addtask rootfs_finalize before do_rootfs after do_rootfs_postprocess
>> +
>>  # Last so that the image type can overwrite tasks if needed
>>  inherit ${IMAGE_TYPE}
>> diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass
>> index 54b5e5c..c3af7c1 100644
>> --- a/meta/classes/rootfs.bbclass
>> +++ b/meta/classes/rootfs.bbclass
>> @@ -201,45 +201,6 @@ rootfs_generate_manifest () {
>>          ${ROOTFS_MANIFEST_DEPLOY_DIR}/"${PF}".manifest
>>  }
>>
>> -ROOTFS_POSTPROCESS_COMMAND += "${@bb.utils.contains('ROOTFS_FEATURES', 'finalize-rootfs', 'rootfs_postprocess_finalize', '', d)}"
>> -rootfs_postprocess_finalize() {
>> -    sudo -s <<'EOSUDO'
>> -        test -e "${ROOTFSDIR}/chroot-setup.sh" && \
>> -            "${ROOTFSDIR}/chroot-setup.sh" "cleanup" "${ROOTFSDIR}"
>> -        rm -f "${ROOTFSDIR}/chroot-setup.sh"
>> -
>> -        test ! -e "${ROOTFSDIR}/usr/share/doc/qemu-user-static" && \
>> -            find "${ROOTFSDIR}/usr/bin" \
>> -                -maxdepth 1 -name 'qemu-*-static' -type f -delete
>> -
>> -        mountpoint -q '${ROOTFSDIR}/isar-apt' && \
>> -            umount -l ${ROOTFSDIR}/isar-apt
>> -        rmdir --ignore-fail-on-non-empty ${ROOTFSDIR}/isar-apt
>> -
>> -        mountpoint -q '${ROOTFSDIR}/base-apt' && \
>> -            umount -l ${ROOTFSDIR}/base-apt
>> -        rmdir --ignore-fail-on-non-empty ${ROOTFSDIR}/base-apt
>> -
>> -        mountpoint -q '${ROOTFSDIR}/dev' && \
>> -            umount -l ${ROOTFSDIR}/dev
>> -        mountpoint -q '${ROOTFSDIR}/sys' && \
>> -            umount -l ${ROOTFSDIR}/proc
>> -        mountpoint -q '${ROOTFSDIR}/sys' && \
>> -            umount -l ${ROOTFSDIR}/sys
>> -
>> -        rm -f "${ROOTFSDIR}/etc/apt/apt.conf.d/55isar-fallback.conf"
>> -
>> -        rm -f "${ROOTFSDIR}/etc/apt/sources.list.d/isar-apt.list"
>> -        rm -f "${ROOTFSDIR}/etc/apt/preferences.d/isar-apt"
>> -        rm -f "${ROOTFSDIR}/etc/apt/sources.list.d/base-apt.list"
>> -
>> -        mv "${ROOTFSDIR}/etc/apt/sources-list" \
>> -            "${ROOTFSDIR}/etc/apt/sources.list.d/bootstrap.list"
>> -
>> -        rm -f "${ROOTFSDIR}/etc/apt/sources-list"
>> -EOSUDO
>> -}
>> -
>>  do_rootfs_postprocess[vardeps] = "${ROOTFS_POSTPROCESS_COMMAND}"
>>  python do_rootfs_postprocess() {
>>      # Take care that its correctly mounted:
>> --
>> 2.17.1
>>
> --
> You received this message because you are subscribed to the Google Groups "isar-users" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/isar-users/7a71ebe9-9846-41ed-beae-a02360129b89%40googlegroups.com.