Skip to content
Snippets Groups Projects

Set additional meta information

Merged Set additional meta information
rclobus-guest/live-build:rclobus/meta_info into master
4 unresolved threads
Merged Roland Clobus requested to merge rclobus-guest/live-build:rclobus/meta_info into master
4 unresolved threads
  • The ISO volume is constructed similar to Debian 11
  • The file .disk/info can be overridden
  • The file .disk/info does not contain 'Official' per default
  • Overrides that are required for live-setup are now explicit in rebuild.sh
  • New .disk/generator contains tracable information to the rebuild.sh script
  • The ISO volume is unique for each desktop environment

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
scripts/build/binary_disk
52 52 case "${LB_MODE}" in
53 53 debian)
54 54 TITLE="Debian GNU/Linux"
55 STRING="Official Snapshot ${ARCHITECTURE}"
  • Roland Clobus
    Roland Clobus @rclobus-guest started a thread on the diff
    • scripts/build/binary_includes
    32 32 # Acquire lock file
    33 33 Acquire_lockfile
    34 34
    35 # Copying includes
    36 cd config/includes.binary
    • Roland Clobus
      Roland Clobus @rclobus-guest ·
      Author Contributor

      This section is now outside the if-block, because Find_files cannot see the hidden folder.

      I've verified that cpio will do nothing if the directory is empty

    • Roland Clobus
      Roland Clobus @rclobus-guest ·
      Author Contributor

      And the pipeline fails with:

      P: Begin copying binary includes...
/usr/lib/live/build/binary_includes: 37: cpio: not found
E: An unexpected failure occurred, exiting...

      So my verification was insufficient.

    • Please register or sign in to reply
  • Roland Clobus
    Roland Clobus @rclobus-guest started a thread on the diff
    • test/rebuild.sh
    306 434 echo "${PACKAGES}" >config/package-lists/desktop.list.chroot
    307 435 fi
    308 436
    437 # Set meta information about the image
    438 mkdir config/includes.binary/.disk
    439 cat << EOF > config/includes.binary/.disk/generator
  • Roland Clobus
    Roland Clobus @rclobus-guest started a thread on the diff
    • test/rebuild.sh
    306 434 echo "${PACKAGES}" >config/package-lists/desktop.list.chroot
    307 435 fi
    308 436
    437 # Set meta information about the image
    438 mkdir config/includes.binary/.disk
    439 cat << EOF > config/includes.binary/.disk/generator
    440 This image was generated by $(basename ${BASH_SOURCE})
    441 Script commandline: ${REBUILD_COMMANDLINE}
    442 Script hash: ${REBUILD_SHA256SUM}
    443 EOF
    444 if [ -z "${DISK_INFO}" ]
    445 then
    446 ISO8601_TIMESTAMP=$(date --utc -d@${SOURCE_DATE_EPOCH} +%Y-%m-%dT%H:%M:%SZ)
    447 DISK_INFO="Auto-generated Debian GNU/Linux Live ${DEBIAN_VERSION_NUMBER} ${CONFIGURATION} ${ISO8601_TIMESTAMP}"
    448 fi
    449 echo -n "${DISK_INFO}" > config/includes.binary/.disk/info
  • Roland Clobus marked this merge request as draft

    marked this merge request as draft

  • Roland Clobus marked this merge request as ready

    marked this merge request as ready

  • Roland Clobus added 1 commit

    added 1 commit

    • e04461ae - Set additional meta information

    Compare with previous version

  • Roland Clobus
    Roland Clobus @rclobus-guest ·
    Author Contributor

    I've changed the dependency on cpio from Recommends to Depends, as cpio is now always invoked.

    Additionally, I did the same for wget, which is used (at least) for firmware downloads

    Edited by Roland Clobus
  • Luca Boccassi
  • Roland Clobus added 1 commit

    added 1 commit

    • 46d7bd25 - Set additional meta information

    Compare with previous version

  • Roland Clobus added 1 commit

    added 1 commit

    • d14306a7 - Set additional meta information

    Compare with previous version

  • Luca Boccassi approved this merge request

    approved this merge request

  • Luca Boccassi enabled an automatic merge when the pipeline for d14306a7 succeeds

    enabled an automatic merge when the pipeline for d14306a7 succeeds

  • Luca Boccassi merged

    merged

  • Roland Clobus mentioned in merge request !314 (merged)

    mentioned in merge request !314 (merged)

  • Roland Clobus mentioned in merge request images-team/live-setup!4 (merged)

    mentioned in merge request images-team/live-setup!4 (merged)

    • Please register or sign in to reply