diff --git a/platforms/rootfs-light/Makefile b/platforms/rootfs-light/Makefile index 815d029..529ad50 100644 --- a/platforms/rootfs-light/Makefile +++ b/platforms/rootfs-light/Makefile @@ -5,10 +5,10 @@ $(MAKEDIST_TARGET)-$(PLATFORM)-aarch64: \ firefox lxdm $(MAKEDIST_TARGET)-$(PLATFORM)-i586: \ - kernel-mamba kernel-mamba-64GB chromium sddm + kernel-mamba kernel-mamba-64GB firefox sddm $(MAKEDIST_TARGET)-$(PLATFORM)-x86_64: \ - kernel-mamba-x86_64 chromium sddm + kernel-mamba-x86_64 firefox sddm $(MAKEDIST_TARGET)-$(PLATFORM): $(MAKEDIST_TARGET)-devel \ lxqt-session openbox lxqt-archiver lximage-qt \ diff --git a/platforms/rootfs/Makefile b/platforms/rootfs/Makefile index ccaafc9..3bed65f 100644 --- a/platforms/rootfs/Makefile +++ b/platforms/rootfs/Makefile @@ -3,13 +3,17 @@ $(MAKEDIST_TARGET)-$(PLATFORM)-kde: desktop-base-kde bluedevil5 kwalletmanager $(MAKEDIST_TARGET)-$(PLATFORM)-arm: \ kernel-mamba-arm linux-firmware midori +$(MAKEDIST_TARGET)-$(PLATFORM)-aarch64: \ + kernel-mamba-aarch64 \ + firefox linux-firmware lxdm + $(MAKEDIST_TARGET)-$(PLATFORM)-i586: \ kernel-mamba kernel-mamba-64GB \ - chromium linux-firmware + firefox linux-firmware sddm $(MAKEDIST_TARGET)-$(PLATFORM)-x86_64: \ kernel-mamba-x86_64 \ - chromium linux-firmware + firefox linux-firmware sddm $(MAKEDIST_TARGET)-$(PLATFORM): $(MAKEDIST_TARGET)-devel \ $(MAKEDIST_TARGET)-$(PLATFORM)-kde openssh-server usbutils wireless_tools \ diff --git a/platforms/rootfs/post.inc.sh b/platforms/rootfs/post.inc.sh index ef60add..ab92126 100644 --- a/platforms/rootfs/post.inc.sh +++ b/platforms/rootfs/post.inc.sh @@ -1,58 +1,17 @@ -# add fstab entries -#cat >> $MOUNTDIR/etc/fstab << _EOF -#/dev/mmcblk0p1 /mnt/sd0 auto defaults,noauto 0 0 -#_EOF -#mkdir $MOUNTDIR/mnt/{ndda1,ndda2,sd0,sda1,sda2} - -# disable nfs -#chroot $MOUNTDIR chkconfig --del nfslock -#chroot $MOUNTDIR chkconfig --del portmap -#chroot $MOUNTDIR chkconfig --del ts-calibrate - -## disable random -#chroot $MOUNTDIR chkconfig --del random - -## enable ftp server -#sed -i "s|\(.*disable[[:space:]]*= \)yes|\1no|" $MOUNTDIR/etc/xinetd.d/vsftpd -#sed -i "s|#local_enable|local_enable|" $NOUNTDIR/etc/vsftpd.conf -#sed -i "s|#write_enable|write_enable|" $NOUNTDIR/etc/vsftpd.conf -#sed -i "/root/d" $MOUNTDIR/etc/vsftpd/user_list -#sed -i "/root/d" $MOUNTDIR/etc/vsftpd/chroot-list - -## remove alsa configuration for now -#rm $MOUNTDIR/etc/asound.conf - -# remove some services -#rm -f $MOUNTDIR/etc/rc?.d/???{iptables,acpid} - -## generate RPM scripts first time execution -#make_rpm_first_time_script "\ -#chkconfig --del acpid -#chkconfig --del alsa -#chkconfig --del iptables -#chkconfig --del nfslock -#chkconfig --del portmap -#" - -## configure touchscreen -#cat > $MOUNTDIR/etc/ts-calibrate.conf << _EOF -#TSLIB_CONFFILE=/etc/ts.conf -#TSLIB_CONSOLEDEVICE=none -#TSLIB_FBDEVICE=/dev/fb0 -#TSLIB_TSDEVICE=/dev/input/event0 -#TSLIB_CALIBFILE=/etc/pointercal -#HOME=/root -#_EOF - ## configure favorites in kde menu #for f in /usr/share/applications/chromium.desktop /opt/kde/share/applications/kaffeine.desktop; do # chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f #done -# remove some documentation to save space -for f in ChangeLog Changelog CHANGES TODO NEWS README README.txt; do - find $MOUNTDIR/usr/share/doc -name $f -exec rm -f {} \; -done +if [ -e $MOUNTDIR/etc/lxdm/lxdm.conf ]; then + sed -i "s|# session=.*|session=/usr/bin/startkde-x11|" $MOUNTDIR/etc/lxdm/lxdm.conf + sed -i "s|# autologin.*|autologin=liveuser|" $MOUNTDIR/etc/lxdm/lxdm.conf +fi + +## remove some documentation to save space +#for f in ChangeLog Changelog CHANGES TODO NEWS README README.txt; do +# find $MOUNTDIR/usr/share/doc -name $f -exec rm -f {} \; +#done # disable filesystem autocheck due to a kernel bug in hannspad (blkid generated kernel crash) if [ "$ARCH" = "arm" ]; then