diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2018-12-16 17:09:08 -0600 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2018-12-16 17:09:08 -0600 |
| commit | dd7dfb9cbc9ba6d967236906d47b087db64bf6b5 (patch) | |
| tree | b63dc06072ff9e1359c0e4f529f9d42e8bd8117f | |
| parent | 1a18c43e6cc2402befd0e6c1153e9080ba65bf98 (diff) | |
| download | image-dd7dfb9cbc9ba6d967236906d47b087db64bf6b5.tar.gz image-dd7dfb9cbc9ba6d967236906d47b087db64bf6b5.tar.bz2 image-dd7dfb9cbc9ba6d967236906d47b087db64bf6b5.tar.xz image-dd7dfb9cbc9ba6d967236906d47b087db64bf6b5.zip | |
Update stuff for beta2 and add docs to full ISO
| -rwxr-xr-x | adelie-build-cd | 9 | ||||
| -rwxr-xr-x | cdinit-ppc64 | bin | 75352 -> 67408 bytes | |||
| -rw-r--r-- | packages | 2 | ||||
| -rwxr-xr-x | post-ppc64.sh | 2 |
4 files changed, 10 insertions, 3 deletions
diff --git a/adelie-build-cd b/adelie-build-cd index 0bf4744..3e90f8c 100755 --- a/adelie-build-cd +++ b/adelie-build-cd @@ -1,7 +1,7 @@ #!/bin/sh def_arch=$(uname -m) -def_ver="1.0-beta1" +def_ver="1.0-beta2" declare -r PROGNAME=$(basename $0) @@ -217,12 +217,19 @@ make_structure() { ISSUE if test -n "${DO_FULL+full}"; then + # This ensures we have documentation available on-disc, and to install. + apk --arch $ARCH \ + -X "$URL/system/$EXTRA_MIRROR" \ + -X "$URL/user/$EXTRA_MIRROR" \ + --root squashroot-$ARCH add docs declare -r PACKAGES_DIR=squashroot-$ARCH/packages/$ARCH mkdir -p $PACKAGES_DIR + # Fetch all APKs. apk --arch $ARCH \ -X "$URL/system/$EXTRA_MIRROR" \ -X "$URL/user/$EXTRA_MIRROR" \ --root squashroot-$ARCH fetch -o $PACKAGES_DIR $(apk --root squashroot-$ARCH info) + # Sign the index using the signing key used by abuild. if test -n "${SIGN+doit}"; then apk index --description "$VERSION/$ARCH Live CD" -o .tmp.APKINDEX.tar.gz $PACKAGES_DIR/*.apk abuild-sign -q .tmp.APKINDEX.tar.gz diff --git a/cdinit-ppc64 b/cdinit-ppc64 Binary files differindex bdd354d..03e4e47 100755 --- a/cdinit-ppc64 +++ b/cdinit-ppc64 @@ -13,7 +13,7 @@ jfsutils lvm2 xfsprogs -easy-kernel-4.14.56-mc9 +easy-kernel easy-kernel-modules dracut diff --git a/post-ppc64.sh b/post-ppc64.sh index 6ff90b0..c91a04d 100755 --- a/post-ppc64.sh +++ b/post-ppc64.sh @@ -20,4 +20,4 @@ cp ppc/grub.cfg64 cdroot-ppc64/boot/grub/grub.cfg mkdir cdroot-ppc64/ppc cp cdroot-ppc64/boot/bootinfo.txt cdroot-ppc64/ppc/bootinfo.txt -mv squashroot-ppc64/boot/vmlinux-4.14.56-mc9-easy-p8 cdroot-ppc64/bzImage-p8 +mv squashroot-ppc64/boot/vmlinux-4.14.88-mc13-easy-p8 cdroot-ppc64/bzImage-p8 |