Merge branch 'master' of https://github.com/void-linux/void-mklive
This commit is contained in:
commit
e4c0b6433c
3
Makefile
3
Makefile
@ -69,6 +69,9 @@ images-all: platformfs-all images-all-sbc images-all-cloud
|
|||||||
|
|
||||||
images-all-sbc: $(ALL_SBC_IMAGES)
|
images-all-sbc: $(ALL_SBC_IMAGES)
|
||||||
|
|
||||||
|
images-all-sbc-print:
|
||||||
|
@echo $(ALL_SBC_IMAGES) | sed "s: :\n:g"
|
||||||
|
|
||||||
images-all-cloud: $(ALL_CLOUD_IMAGES)
|
images-all-cloud: $(ALL_CLOUD_IMAGES)
|
||||||
|
|
||||||
images-all-print:
|
images-all-print:
|
||||||
|
@ -22,8 +22,7 @@ if [ -d ${NEWROOT}/etc/gdm ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Configure sddm autologin for the kde iso.
|
# Configure sddm autologin for the kde iso.
|
||||||
if [ -r ${NEWROOT}/etc/sddm.conf ]; then
|
if [ -x ${NEWROOT}/usr/bin/sddm ]; then
|
||||||
mv ${NEWROOT}/etc/sddm.conf ${NEWROOT}/etc/sddm.conf.old
|
|
||||||
cat > ${NEWROOT}/etc/sddm.conf <<_EOF
|
cat > ${NEWROOT}/etc/sddm.conf <<_EOF
|
||||||
[Autologin]
|
[Autologin]
|
||||||
User=anon
|
User=anon
|
||||||
|
@ -25,7 +25,6 @@ install() {
|
|||||||
|
|
||||||
inst_hook pre-pivot 01 "$moddir/adduser.sh"
|
inst_hook pre-pivot 01 "$moddir/adduser.sh"
|
||||||
inst_hook pre-pivot 02 "$moddir/display-manager-autologin.sh"
|
inst_hook pre-pivot 02 "$moddir/display-manager-autologin.sh"
|
||||||
inst_hook pre-pivot 03 "$moddir/copy-initramfs.sh"
|
inst_hook pre-pivot 03 "$moddir/locale.sh"
|
||||||
inst_hook pre-pivot 04 "$moddir/locale.sh"
|
inst_hook pre-pivot 04 "$moddir/services.sh"
|
||||||
inst_hook pre-pivot 05 "$moddir/services.sh"
|
|
||||||
}
|
}
|
||||||
|
37
release.sh.in
Normal file
37
release.sh.in
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
REPOSITORY="/hostdir/binpkgs /hostdir/binpkgs/musl /hostdir/binpkgs/aarch64"
|
||||||
|
DATECODE=$(date "+%Y%m%d")
|
||||||
|
|
||||||
|
make
|
||||||
|
|
||||||
|
ARCHS="$(echo x86_64{,-musl} armv{6,7}l{,-musl} aarch64{,-musl})"
|
||||||
|
PLATFORMS="$(echo rpi{,2,3}{,-musl} beaglebone{,-musl} cubieboard2{,-musl} odroid-c2{,-musl})"
|
||||||
|
SBC_IMGS="$(echo rpi{,2,3}{,-musl} beaglebone{,-musl} cubieboard2{,-musl} odroid-c2{,-musl})"
|
||||||
|
|
||||||
|
make rootfs-all ARCHS="$ARCHS" REPOSITORY="$REPOSITORY" DATECODE="$DATECODE"
|
||||||
|
make platformfs-all PLATFORMS="$PLATFORMS" REPOSITORY="$REPOSITORY" DATECODE="$DATECODE"
|
||||||
|
make images-all-sbc SBC_IMGS="$SBC_IMGS" REPOSITORY="$REPOSITORY" DATECODE="$DATECODE"
|
||||||
|
make pxe-all REPOSITORY="$REPOSITORY"
|
||||||
|
|
||||||
|
MKLIVE_REPO=(-r /hostdir/binpkgs -r /hostdir/binpkgs/nonfree -r /hostdir/musl -r /hostdir/binpkgs/musl/nonfree)
|
||||||
|
./build-x86-images.sh -a i686 -b base "${MKLIVE_REPO[@]}"
|
||||||
|
./build-x86-images.sh -a i686 -b xfce "${MKLIVE_REPO[@]}"
|
||||||
|
|
||||||
|
./build-x86-images.sh -a x86_64 -b base "${MKLIVE_REPO[@]}"
|
||||||
|
./build-x86-images.sh -a x86_64 -b xfce "${MKLIVE_REPO[@]}"
|
||||||
|
./build-x86-images.sh -a x86_64 -b cinnamon "${MKLIVE_REPO[@]}"
|
||||||
|
./build-x86-images.sh -a x86_64 -b lxde "${MKLIVE_REPO[@]}"
|
||||||
|
|
||||||
|
./build-x86-images.sh -a x86_64-musl -b base "${MKLIVE_REPO[@]}"
|
||||||
|
./build-x86-images.sh -a x86_64-musl -b xfce "${MKLIVE_REPO[@]}"
|
||||||
|
./build-x86-images.sh -a x86_64-musl -b cinnamon "${MKLIVE_REPO[@]}"
|
||||||
|
./build-x86-images.sh -a x86_64-musl -b lxde "${MKLIVE_REPO[@]}"
|
||||||
|
|
||||||
|
mkdir "$DATECODE"
|
||||||
|
mv "*${DATECODE}*.xz" "$DATECODE/"
|
||||||
|
mv "*${DATECODE}*.gz" "$DATECODE/"
|
||||||
|
mv "*${DATECODE}*.iso" "$DATECODE/"
|
||||||
|
|
||||||
|
cd "$DATECODE" || exit 1
|
||||||
|
sha256sum -- * > sha256sums.txt
|
Loading…
x
Reference in New Issue
Block a user