openmamba/makedist-openmamba
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

livecd, livedvd: packages lists updates and script fixes

Browse Source
This commit is contained in:
Silvan Calarco 2022-07-09 13:39:39 +02:00
parent 60cd48f5e4
commit dfb2a9c1f7
3 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
platforms/livecd-root/Makefile
View File

@ -11,10 +11,8 @@ $(MAKEDIST_TARGET)-livecd-root: \
ttf-freefont liberation-fonts-ttf \ ttf-freefont liberation-fonts-ttf \
partitionmanager ntfs-3g libdvdcss \ partitionmanager ntfs-3g libdvdcss \
NetworkManager ModemManager \ NetworkManager ModemManager \
firefox vixie-cron logrotate \ firefox livecd-tools \
livecd-tools \ parted samba-server sddm \
Mesa-tools driconf parted testdisk \
samba-server sddm \
mambatray dnf \ mambatray dnf \
$(MAKEDIST_TARGET)-livecd-kde $(MAKEDIST_TARGET)-livecd-kde

18
platforms/livedvd-root/Makefile
View File

@ -1,6 +1,6 @@
$(MAKEDIST_TARGET)-livedvd-kde: desktop-base-kde krfb ark kcalc kdf kgpg \ $(MAKEDIST_TARGET)-livedvd-kde: desktop-base-kde krfb ark kcalc kdf kgpg \
spectacle okular kontact kmail akregator \ spectacle okular kontact kmail akregator \
kopete bluedevil5 smb4k amarok kwalletmanager dragon kate kopete bluedevil5 smb4k kwalletmanager dragon kate
$(MAKEDIST_TARGET)-livedvd-libreoffice: libreoffice-calc libreoffice-writer libreoffice-impress $(MAKEDIST_TARGET)-livedvd-libreoffice: libreoffice-calc libreoffice-writer libreoffice-impress
$(MAKEDIST_TARGET)-livedvd-root: \ $(MAKEDIST_TARGET)-livedvd-root: \
@ -10,20 +10,20 @@ $(MAKEDIST_TARGET)-livedvd-root: \
xorg-apps-extra xterm \ xorg-apps-extra xterm \
ttf-freefont liberation-fonts-ttf \ ttf-freefont liberation-fonts-ttf \
partitionmanager ntfs-3g libdvdcss \ partitionmanager ntfs-3g libdvdcss \
firefox kpartsplugin vixie-cron logrotate \ firefox kpartsplugin \
macbook-tools livecd-tools gdb \ macbook-tools livecd-tools gdb \
Mesa-tools driconf parted testdisk samba-server \ parted samba-server \
mambatray sddm \ mambatray sddm \
$(MAKEDIST_TARGET)-livedvd-kde testdisk photorec $(MAKEDIST_TARGET)-livedvd-kde
$(MAKEDIST_TARGET)-livedvd-root-x86_64: VirtualBox-guest $(MAKEDIST_TARGET)-livedvd-root-x86_64: VirtualBox-guest
# Localization targets # Localization targets
$(MAKEDIST_TARGET)-livedvd-root-de: langpacks-de firefox-langpack-de $(MAKEDIST_TARGET)-livedvd-root-de: langpacks-de firefox-langpack-de libreoffice-langpack-de
$(MAKEDIST_TARGET)-livedvd-root-en: langpacks-en_GB $(MAKEDIST_TARGET)-livedvd-root-en: langpacks-en_GB libreoffice-langpack-en_GB
$(MAKEDIST_TARGET)-livedvd-root-es: langpacks-es firefox-langpack-es-ES $(MAKEDIST_TARGET)-livedvd-root-es: langpacks-es firefox-langpack-es-ES libreoffice-langpack-es
$(MAKEDIST_TARGET)-livedvd-root-fr: langpacks-fr firefox-langpack-fr $(MAKEDIST_TARGET)-livedvd-root-fr: langpacks-fr firefox-langpack-fr libreoffice-langpack-fr
$(MAKEDIST_TARGET)-livedvd-root-it: langpacks-it firefox-langpack-it $(MAKEDIST_TARGET)-livedvd-root-it: langpacks-it firefox-langpack-it libreoffice-langpack-it
# FIXME: add kdepim # FIXME: add kdepim
syslog-ng: syslog-ng:
@echo @echo

34
platforms/livedvd/post.inc.sh
View File

@ -70,9 +70,9 @@ for l in $MULTILANGUAGE; do
submenu "${LABEL}" { submenu "${LABEL}" {
_EOF _EOF
ISOID= ISOID=
for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
cat >> $MOUNTDIR2/boot/grub/grub.cfg << _EOF cat >> $MOUNTDIR2/boot/grub/grub.cfg << _EOF
menuentry "openmamba GNU/Linux (${KERNEL_MAJVER}${K} - ${l})" { menuentry "openmamba GNU/Linux (${KERNEL_MAJVER}${K} - ${l})" {
echo "Loading /boot/vmlinuz${ISOID}" echo "Loading /boot/vmlinuz${ISOID}"
linux /boot/vmlinuz${ISOID} root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} selinux=0 quiet splash ro locale.LANG=$LOCALELANG vconsole.keymap=$VCONSOLEKEYMAP linux /boot/vmlinuz${ISOID} root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} selinux=0 quiet splash ro locale.LANG=$LOCALELANG vconsole.keymap=$VCONSOLEKEYMAP
@ -80,8 +80,8 @@ menuentry "openmamba GNU/Linux (${KERNEL_MAJVER}${K} - ${l})" {
initrd /boot/initrd${ISOID}.gz initrd /boot/initrd${ISOID}.gz
} }
_EOF _EOF
ISOID=$(($ISOID + 1)) ISOID=$(($ISOID + 1))
done done
cat >> $MOUNTDIR2/boot/grub/grub.cfg << _EOF cat >> $MOUNTDIR2/boot/grub/grub.cfg << _EOF
submenu "Advanced options for openmamba GNU/Linux" { submenu "Advanced options for openmamba GNU/Linux" {
@ -100,9 +100,9 @@ _EOF
# ISOID=$(($ISOID + 1)) # ISOID=$(($ISOID + 1))
#done #done
ISOID= ISOID=
for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
cat >> $MOUNTDIR2/boot/grub/grub.cfg << _EOF cat >> $MOUNTDIR2/boot/grub/grub.cfg << _EOF
menuentry "Debug mode (${KERNEL_MAJVER}${K} - ${l})" { menuentry "Debug mode (${KERNEL_MAJVER}${K} - ${l})" {
echo "Loading /boot/vmlinuz${ISOID}" echo "Loading /boot/vmlinuz${ISOID}"
linux /boot/vmlinuz${ISOID} root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} ro selinux=0 rddebug locale.LANG=$LOCALELANG vconsole.keymap=$VCONSOLEKEYMAP linux /boot/vmlinuz${ISOID} root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} ro selinux=0 rddebug locale.LANG=$LOCALELANG vconsole.keymap=$VCONSOLEKEYMAP
@ -110,11 +110,11 @@ for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
initrd /boot/initrd${ISOID}.gz initrd /boot/initrd${ISOID}.gz
} }
_EOF _EOF
ISOID=$(($ISOID + 1)) ISOID=$(($ISOID + 1))
done done
ISOID= ISOID=
for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
cat >> $MOUNTDIR2/boot/grub/grub.cfg << _EOF cat >> $MOUNTDIR2/boot/grub/grub.cfg << _EOF
menuentry "Debug mode with nomodeset (${KERNEL_MAJVER}${K} - ${l})" { menuentry "Debug mode with nomodeset (${KERNEL_MAJVER}${K} - ${l})" {
echo "Loading /boot/vmlinuz${ISOID}" echo "Loading /boot/vmlinuz${ISOID}"
linux /boot/vmlinuz${ISOID} root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} ro selinux=0 rddebug nomodeset locale.LANG=$LOCALELANG vconsole.keymap=$VCONSOLEKEYMAP linux /boot/vmlinuz${ISOID} root=live:LABEL=${MAKEDIST_TARGET}_${PLATFORM} ro selinux=0 rddebug nomodeset locale.LANG=$LOCALELANG vconsole.keymap=$VCONSOLEKEYMAP
@ -122,14 +122,14 @@ for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
initrd /boot/initrd${ISOID}.gz initrd /boot/initrd${ISOID}.gz
} }
_EOF _EOF
ISOID=$(($ISOID + 1)) ISOID=$(($ISOID + 1))
done done
cat >> $MOUNTDIR2/boot/grub/grub.cfg << _EOF cat >> $MOUNTDIR2/boot/grub/grub.cfg << _EOF
} }
} }
_EOF _EOF
done
# configure isolinux boot loader (obsolete) # configure isolinux boot loader (obsolete)
cat > $MOUNTDIR2/boot/isolinux/isolinux.cfg.utf8 << _EOF cat > $MOUNTDIR2/boot/isolinux/isolinux.cfg.utf8 << _EOF