Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-02-23 11:21:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Various fixes

Browse Source 
Fixed prefix for passes to not conflict with global prefix
Set layer to none for layer without language packs
Copy size and manifest to the target directory
Make sure the diff always diffes existing manifests
This commit is contained in:
Jean-Baptiste Lallement 2018-11-20 17:51:41 +01:00
parent 9077289332
commit 047f883e92
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
live-build/auto/build
View File

@ -47,7 +47,7 @@ build_layered_squashfs() {
create_manifest "chroot" "${squashfs_f_manifest}.full"
# Delta manifest
diff -NU0 ${PWD}/livecd.${PROJECT}.${prefix}${prevpass}.manifest.full ${squashfs_f_manifest}.full|grep -v ^@ > $squashfs_f_manifest
diff -U0 ${PWD}/livecd.${PROJECT}.[0-9]{2..2}-${prevpass}.manifest.full ${squashfs_f_manifest}.full|grep -v ^@ > $squashfs_f_manifest
squashfs_f_size="${base}.size"
du -B 1 -s "chroot.${pass}/" | cut -f1 > "${squashfs_f_size}"
@ -539,13 +539,13 @@ EOF
if [ -n "${PASSES}" ]; then
CURPASS=1
PREVPASS=""
PREFIX=""
PASSPREFIX=""
LOWER_LAYERS=""
for _PASS in $PASSES
do
PREFIX="$(printf "%02g" $CURPASS)-"
build_layered_squashfs "${_PASS}" "${PREVPASS}" "$PREFIX" ${LOWER_LAYERS}
PASSPREFIX="$(printf "%02g" $CURPASS)-"
build_layered_squashfs "${_PASS}" "${PREVPASS}" "$PASSPREFIX" ${LOWER_LAYERS}
LOWER_LAYERS="chroot.${_PASS}:$LOWER_LAYERS"
LOWER_LAYERS="${LOWER_LAYERS%:}"
@ -553,8 +553,9 @@ EOF
CURPASS=$(( CURPASS + 1 ))
done
# Full ISO manifest
cp "${PWD}/livecd.${PROJECT}.${PREFIX}${_PASS}.manifest.full" livecd.${PROJECT}.manifest
# Full ISO manifest & size from last PASS
cp "${PWD}/livecd.${PROJECT}.${PASSPREFIX}${_PASS}.size" "binary/$INITFS/filesystem.size"
cp "${PWD}/livecd.${PROJECT}.${PASSPREFIX}${_PASS}.manifest.full" "binary/$INITFS/filesystem.manifest"
fi
touch binary.success

6
live-build/auto/config
View File

@ -141,7 +141,7 @@ add_layered_pass_delta() {
local seed_regexp="$3"
if [ -z "${seed_regexp}" ]; then
substract_package_lists ${2} "" >> config/package-lists/livecd-rootfs.removal-list.chroot_${1}_no-{$2}
substract_package_lists ${2} "" >> config/package-lists/livecd-rootfs.removal-list.chroot_${1}_no-${2}
return
fi
@ -405,9 +405,9 @@ case $PROJECT in
layered)
# LANG PASS for minimal and install
add_layered_pass_delta install-minimal desktop-minimal-default-languages '^desktop-minimal-(?!default-languages)[^.]+$'
add_layered_pass_delta install-minimal desktop-minimal-default-languages 'nolangpacks' # none (if no default langpack is selected)
add_layered_pass_delta install-minimal desktop-minimal-default-languages '' # none (if no default langpack is selected)
add_layered_pass_delta install desktop-default-languages '^desktop-(?!default-languages|minimal|common)[^.]+$'
add_layered_pass_delta install desktop-default-languages 'nolangpacks' # none (if no default langpack is selected)
add_layered_pass_delta install desktop-default-languages '' # none (if no default langpack is selected)
;;
esac