From a0807e6b996e69653750c08b86827282e658bceb Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 5 Jun 2021 14:21:52 +0200 Subject: [PATCH] Various small update fixes --- Makefile.defs | 2 +- platforms/diskimg/pre.inc.sh | 2 +- platforms/livecd-light-root/Makefile | 2 +- platforms/livecd-root/Makefile | 2 +- platforms/livedvd-root/Makefile | 2 +- platforms/rootfs-light/Makefile | 8 ++++---- platforms/rootfs/Makefile | 8 ++++---- platforms/rootfs/Makefile.defs | 25 ++----------------------- 8 files changed, 15 insertions(+), 36 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 42aaec6..49f0917 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -803,7 +803,7 @@ endif networkmanagervpnplugin = NetworkManager-openvpn knetworkmanagervpnplugin = plasma-applet-networkmanagement-openvpn -packagekitgui = kpackagekit +packagekitgui = discover firewallgui = kcm_ufw # pkgconfig diff --git a/platforms/diskimg/pre.inc.sh b/platforms/diskimg/pre.inc.sh index 686d848..cd2c940 100644 --- a/platforms/diskimg/pre.inc.sh +++ b/platforms/diskimg/pre.inc.sh @@ -17,6 +17,6 @@ case $VARIANT in BASE_IMAGE="openmamba-rootfs" MODE=rootfsinstall ROOTFSINSTALL_ADD="-rpi64" - MEDIA_SIZE=6912 ;; + MEDIA_SIZE=7680 ;; *) MODE=rootfsinstall; ROOTFSINSTALL_ADD= ;; esac diff --git a/platforms/livecd-light-root/Makefile b/platforms/livecd-light-root/Makefile index 62de84a..d64b16c 100644 --- a/platforms/livecd-light-root/Makefile +++ b/platforms/livecd-light-root/Makefile @@ -29,6 +29,6 @@ $(MAKEDIST_TARGET)-livecd-light-root: \ # Localization targets $(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-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-it: langpacks-it firefox-langpack-it diff --git a/platforms/livecd-root/Makefile b/platforms/livecd-root/Makefile index 2e26e29..e3385e5 100644 --- a/platforms/livecd-root/Makefile +++ b/platforms/livecd-root/Makefile @@ -21,6 +21,6 @@ $(MAKEDIST_TARGET)-livecd-root: \ # Localization targets $(MAKEDIST_TARGET)-livecd-root-de: langpacks-de firefox-langpack-de $(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-it: langpacks-it firefox-langpack-it diff --git a/platforms/livedvd-root/Makefile b/platforms/livedvd-root/Makefile index a667d1f..6747b4b 100644 --- a/platforms/livedvd-root/Makefile +++ b/platforms/livedvd-root/Makefile @@ -18,7 +18,7 @@ $(MAKEDIST_TARGET)-livedvd-root: \ # Localization targets $(MAKEDIST_TARGET)-livedvd-root-de: langpacks-de firefox-langpack-de $(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-it: langpacks-it firefox-langpack-it # FIXME: add kdepim diff --git a/platforms/rootfs-light/Makefile b/platforms/rootfs-light/Makefile index f992ab2..c92f59f 100644 --- a/platforms/rootfs-light/Makefile +++ b/platforms/rootfs-light/Makefile @@ -24,8 +24,8 @@ $(MAKEDIST_TARGET)-$(PLATFORM): $(MAKEDIST_TARGET)-devel \ postplug-xorg postplug-sound partitionmanager tar net-tools mambatray qtvkbd # 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)-es: langpacks-es firefox-langpacks-es -$(MAKEDIST_TARGET)-$(PLATFORM)-fr: langpacks-fr firefox-langpacks-fr -$(MAKEDIST_TARGET)-$(PLATFORM)-it: langpacks-it firefox-langpacks-it +$(MAKEDIST_TARGET)-$(PLATFORM)-es: langpacks-es firefox-langpack-es-ES +$(MAKEDIST_TARGET)-$(PLATFORM)-fr: langpacks-fr firefox-langpack-fr +$(MAKEDIST_TARGET)-$(PLATFORM)-it: langpacks-it firefox-langpack-it diff --git a/platforms/rootfs/Makefile b/platforms/rootfs/Makefile index 3bed65f..6628987 100644 --- a/platforms/rootfs/Makefile +++ b/platforms/rootfs/Makefile @@ -37,8 +37,8 @@ $(MAKEDIST_TARGET)-$(PLATFORM): $(MAKEDIST_TARGET)-devel \ # NetworkManager strace gpsd # 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)-es: langpacks-es -$(MAKEDIST_TARGET)-$(PLATFORM)-fr: langpacks-fr -$(MAKEDIST_TARGET)-$(PLATFORM)-it: langpacks-it +$(MAKEDIST_TARGET)-$(PLATFORM)-es: langpacks-es firefox-langpack-es-ES +$(MAKEDIST_TARGET)-$(PLATFORM)-fr: langpacks-fr firefox-langpack-fr +$(MAKEDIST_TARGET)-$(PLATFORM)-it: langpacks-it firefox-langpack-it diff --git a/platforms/rootfs/Makefile.defs b/platforms/rootfs/Makefile.defs index 51ef6a6..c6d3f1c 100644 --- a/platforms/rootfs/Makefile.defs +++ b/platforms/rootfs/Makefile.defs @@ -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 +packagekitgui = discover +firewallgui = gui-ufw