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

Various small update fixes

Browse Source
This commit is contained in:
Silvan Calarco 2021-06-05 14:21:52 +02:00
parent 7f4f177389
commit a0807e6b99
8 changed files with 15 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.defs
View File

@ -803,7 +803,7 @@ endif
networkmanagervpnplugin = NetworkManager-openvpn networkmanagervpnplugin = NetworkManager-openvpn
knetworkmanagervpnplugin = plasma-applet-networkmanagement-openvpn knetworkmanagervpnplugin = plasma-applet-networkmanagement-openvpn
packagekitgui = kpackagekit packagekitgui = discover
firewallgui = kcm_ufw firewallgui = kcm_ufw
# pkgconfig # pkgconfig

2
platforms/diskimg/pre.inc.sh
View File

@ -17,6 +17,6 @@ case $VARIANT in
BASE_IMAGE="openmamba-rootfs" BASE_IMAGE="openmamba-rootfs"
MODE=rootfsinstall MODE=rootfsinstall
ROOTFSINSTALL_ADD="-rpi64" ROOTFSINSTALL_ADD="-rpi64"
MEDIA_SIZE=6912 ;; MEDIA_SIZE=7680 ;;
*) MODE=rootfsinstall; ROOTFSINSTALL_ADD= ;; *) MODE=rootfsinstall; ROOTFSINSTALL_ADD= ;;
esac esac

2
platforms/livecd-light-root/Makefile
View File

@ -29,6 +29,6 @@ $(MAKEDIST_TARGET)-livecd-light-root: \
# Localization targets # Localization targets
$(MAKEDIST_TARGET)-livecd-light-root-de: langpacks-de firefox-langpack-de $(MAKEDIST_TARGET)-livecd-light-root-de: langpacks-de firefox-langpack-de
$(MAKEDIST_TARGET)-livecd-light-root-en: langpacks-en_GB $(MAKEDIST_TARGET)-livecd-light-root-en: langpacks-en_GB
$(MAKEDIST_TARGET)-livecd-light-root-es: langpacks-es firefox-langpack-es $(MAKEDIST_TARGET)-livecd-light-root-es: langpacks-es firefox-langpack-es-ES
$(MAKEDIST_TARGET)-livecd-light-root-fr: langpacks-fr firefox-langpack-fr $(MAKEDIST_TARGET)-livecd-light-root-fr: langpacks-fr firefox-langpack-fr
$(MAKEDIST_TARGET)-livecd-light-root-it: langpacks-it firefox-langpack-it $(MAKEDIST_TARGET)-livecd-light-root-it: langpacks-it firefox-langpack-it

2
platforms/livecd-root/Makefile
View File

@ -21,6 +21,6 @@ $(MAKEDIST_TARGET)-livecd-root: \
# Localization targets # Localization targets
$(MAKEDIST_TARGET)-livecd-root-de: langpacks-de firefox-langpack-de $(MAKEDIST_TARGET)-livecd-root-de: langpacks-de firefox-langpack-de
$(MAKEDIST_TARGET)-livecd-root-en: langpacks-en_GB $(MAKEDIST_TARGET)-livecd-root-en: langpacks-en_GB
$(MAKEDIST_TARGET)-livecd-root-es: langpacks-es firefox-langpack-es $(MAKEDIST_TARGET)-livecd-root-es: langpacks-es firefox-langpack-es-ES
$(MAKEDIST_TARGET)-livecd-root-fr: langpacks-fr firefox-langpack-fr $(MAKEDIST_TARGET)-livecd-root-fr: langpacks-fr firefox-langpack-fr
$(MAKEDIST_TARGET)-livecd-root-it: langpacks-it firefox-langpack-it $(MAKEDIST_TARGET)-livecd-root-it: langpacks-it firefox-langpack-it

2
platforms/livedvd-root/Makefile
View File

@ -18,7 +18,7 @@ $(MAKEDIST_TARGET)-livedvd-root: \
# Localization targets # Localization targets
$(MAKEDIST_TARGET)-livedvd-root-de: langpacks-de firefox-langpack-de $(MAKEDIST_TARGET)-livedvd-root-de: langpacks-de firefox-langpack-de
$(MAKEDIST_TARGET)-livedvd-root-en: langpacks-en_GB $(MAKEDIST_TARGET)-livedvd-root-en: langpacks-en_GB
$(MAKEDIST_TARGET)-livedvd-root-es: langpacks-es firefox-langpack-es $(MAKEDIST_TARGET)-livedvd-root-es: langpacks-es firefox-langpack-es-ES
$(MAKEDIST_TARGET)-livedvd-root-fr: langpacks-fr firefox-langpack-fr $(MAKEDIST_TARGET)-livedvd-root-fr: langpacks-fr firefox-langpack-fr
$(MAKEDIST_TARGET)-livedvd-root-it: langpacks-it firefox-langpack-it $(MAKEDIST_TARGET)-livedvd-root-it: langpacks-it firefox-langpack-it
# FIXME: add kdepim # FIXME: add kdepim

8
platforms/rootfs-light/Makefile
View File

@ -24,8 +24,8 @@ $(MAKEDIST_TARGET)-$(PLATFORM): $(MAKEDIST_TARGET)-devel \
postplug-xorg postplug-sound partitionmanager tar net-tools mambatray qtvkbd postplug-xorg postplug-sound partitionmanager tar net-tools mambatray qtvkbd
# Localization targets # Localization targets
$(MAKEDIST_TARGET)-$(PLATFORM)-de: langpacks-de firefox-langpacks-de $(MAKEDIST_TARGET)-$(PLATFORM)-de: langpacks-de firefox-langpack-de
$(MAKEDIST_TARGET)-$(PLATFORM)-en: langpacks-en_GB $(MAKEDIST_TARGET)-$(PLATFORM)-en: langpacks-en_GB
$(MAKEDIST_TARGET)-$(PLATFORM)-es: langpacks-es firefox-langpacks-es $(MAKEDIST_TARGET)-$(PLATFORM)-es: langpacks-es firefox-langpack-es-ES
$(MAKEDIST_TARGET)-$(PLATFORM)-fr: langpacks-fr firefox-langpacks-fr $(MAKEDIST_TARGET)-$(PLATFORM)-fr: langpacks-fr firefox-langpack-fr
$(MAKEDIST_TARGET)-$(PLATFORM)-it: langpacks-it firefox-langpacks-it $(MAKEDIST_TARGET)-$(PLATFORM)-it: langpacks-it firefox-langpack-it

8
platforms/rootfs/Makefile
View File

@ -37,8 +37,8 @@ $(MAKEDIST_TARGET)-$(PLATFORM): $(MAKEDIST_TARGET)-devel \
# NetworkManager strace gpsd # NetworkManager strace gpsd
# Localization targets # Localization targets
$(MAKEDIST_TARGET)-$(PLATFORM)-de: langpacks-de $(MAKEDIST_TARGET)-$(PLATFORM)-de: langpacks-de firefox-langpack-de
$(MAKEDIST_TARGET)-$(PLATFORM)-en: langpacks-en_GB $(MAKEDIST_TARGET)-$(PLATFORM)-en: langpacks-en_GB
$(MAKEDIST_TARGET)-$(PLATFORM)-es: langpacks-es $(MAKEDIST_TARGET)-$(PLATFORM)-es: langpacks-es firefox-langpack-es-ES
$(MAKEDIST_TARGET)-$(PLATFORM)-fr: langpacks-fr $(MAKEDIST_TARGET)-$(PLATFORM)-fr: langpacks-fr firefox-langpack-fr
$(MAKEDIST_TARGET)-$(PLATFORM)-it: langpacks-it $(MAKEDIST_TARGET)-$(PLATFORM)-it: langpacks-it firefox-langpack-it

25
platforms/rootfs/Makefile.defs
View File

@ -1,24 +1,3 @@
# Fake requirement as no arm bootloader is present
#bootloader = bash
# xorg
#xorglibGL = libGL-Mesa-dri
# libGL-fglrx-X11 libGL-nvidia-X11 libGL-nvidia_71xx-X11 libGL-nvidia_96xx-X11 libGL-nvidia_173xx-X11
#xorglibglx = xorg-ext-libglx
# xorg-ext-libglx-nvidia xorg-ext-libglx-nvidia_71xx xorg-ext-libglx-nvidia_96xx xorg-ext-libglx-nvidia_173xx
#libGLcore.so.1 = xorg-drv-video-nvidia xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx
#libnvidia-tls.so.1 = xorg-drv-video-nvidia xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx
#ifeq ($(ARCH),arm)
#xorgdrvvideo = xorg-drv-video-fbdev xorg-drv-video-tegra
#endif
## ffmpeg / libav
#libpostproc.so.51 = libpostproc-ffmpeg
#libpostproc.so.51[LIBPOSTPROC_51] = libpostproc-ffmpeg
#ffmpegpresets := ffmpeg-presets
## kde
#sopranobackend = soprano-backend-virtuoso
#libphonon.so.4 = libphonon
#phonon_backend = phonon-backend-gstreamer
#
networkmanagergui = plasma-nm networkmanagergui = plasma-nm
packagekitgui = discover
firewallgui = gui-ufw