~kdeneon/livecd-rootfs-neon/trunk

« back to all changes in this revision

Viewing changes to live-build/auto/build

  • Committer: Harald Sitter
  • Date: 2018-02-14 13:44:31 UTC
  • Revision ID: sitter@kde.org-20180214134431-bpemwecvpepqi23c
brings back cdrom hack but only for ubiquity

last night I had a genious idea. we'll use a cdrom repo for ubiquity ISOs and a preinstall repo
for !ubiquity (i.e. clamares). ubiquity knows how to handle cdrom but not how to clean up
preinstall, conversely calamares doesn't know how to deal with cdrom but can easily be made
to handle preinstall.

in this new world order ubiquity ISOs get their cdrom repo updated while calamares ones
use the old one from live-buid (ideally we should do away with the fork.
clamares ISOs get a preinstall repo and a tiny extension to cleanup logic

Show diffs side-by-side

added added

removed removed

Lines of Context:
288
288
                apt-key --keyring chroot/etc/apt/trusted.gpg add config/gnupg/pubring.gpg
289
289
                find chroot/var/lib/preinstalled-pool/ -name Packages | xargs rm
290
290
 
 
291
                ## Mangle binary ISO maindir to contain cdrom repo.
 
292
                ## But only if the installer is Ubiquity, Calamares has special code
 
293
                ## to clean up the preinstalled repo after installation.
 
294
                if [ -e chroot/usr/bin/ubiquity ]; then
 
295
                        mkdir -p binary/.disk/ || true
 
296
                        echo full_cd/single > binary/.disk/cd_type
 
297
 
 
298
                        rm -rf binary/dists/
 
299
                        mv chroot/var/lib/preinstalled-pool/dists binary/
 
300
                        rm -rf binary/pool/
 
301
                        mv chroot/var/lib/preinstalled-pool/pool binary/
 
302
 
 
303
                        rm chroot/etc/apt/sources.list.d/preinstalled-pool.list
 
304
                        rm -r chroot/var/lib/preinstalled-pool/
 
305
                fi
 
306
                ## End of mangle
 
307
 
291
308
                Chroot chroot "apt-get update"
292
309
        fi
293
310
        if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-touch-custom" ]; then