From d0d0d3de6d616660b916ed2002e4e2b2f1756f8a Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Mon, 29 Jan 2018 12:55:39 +0100 Subject: [PATCH] Changes following KDE 5 Plasma support --- Makefile | 12 ++++++------ Makefile.defs | 2 +- makedist.inc.sh | 6 ++++-- platforms/flash-server/post.inc.sh | 5 +---- platforms/livecd-gnome-root/Makefile | 2 +- platforms/livecd-gnome-root/post.inc.sh | 2 +- platforms/livecd-light-root/Makefile | 2 +- platforms/livecd-light-root/post.inc.sh | 2 +- platforms/livecd-root/Makefile | 18 ++++++++---------- platforms/livecd-root/post.inc.sh | 2 +- platforms/livedvd-root/Makefile | 20 ++++++++++---------- platforms/livedvd-root/post.inc.sh | 2 +- platforms/livegames-root/Makefile | 12 ++++++------ platforms/livegames-root/post.inc.sh | 2 +- platforms/rootfs-light/Makefile | 2 +- platforms/rootfs-light/post.inc.sh | 2 +- platforms/rootfs/Makefile | 14 +++++++------- platforms/rootfs/post.inc.sh | 2 +- platforms/testcd-root/Makefile | 14 +++++++------- platforms/testcd-root/post.inc.sh | 2 +- platforms/virtualserver/post.inc.sh | 5 +---- 21 files changed, 62 insertions(+), 68 deletions(-) diff --git a/Makefile b/Makefile index dd8cba5..3a2ed93 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ $(MAKEDIST_TARGET)-firmwares: ipw2100-firmware ipw2200-firmware zd1211-firmware $(MAKEDIST_TARGET)-commontools: $(_init_system) util-linux kmod \ procps sed grep tar bzip2 unzip zip pciutils lshw \ pam shadow-common pwdutils acpid screen \ - net-tools prelink mc dhcpclient timezone nfs-utils \ + net-tools mc dhcpclient timezone nfs-utils \ wireless_tools wpa_supplicant openmamba-release refit-tools openssh-clients \ dosfstools man mbr iptables cups vim iputils sudo postplug less \ reiserfsprogs ppp b43-tools mdadm usb-modeswitch \ @@ -37,11 +37,11 @@ endif # { echo -n "$@ "; \ # [ "$(MULTILANGUAGE)" ] && for l in $(MULTILANGUAGE); do echo -n "kde-i18n-$$l "; done; \ # [ ! "$(LANGUAGE)" = "" ] && [ ! "$(LANGUAGE)" = "en" ] && echo -n "kde-i18n-$(LANGUAGE) "; } || : -kdelibs: - @[ `echo " $$INSTALLED " | grep -c " $@ "` -eq 0 ] && \ - { echo -n "$@ "; \ - [ "$(MULTILANGUAGE)" != "" ] && for l in $(MULTILANGUAGE); do echo -n "kde-l10n-$$l "; done; \ - [ ! "$(LANGUAGE)" = "" ] && [ ! "$(LANGUAGE)" = "en" ] && echo -n "kde-l10n-$(LANGUAGE) "; } || : +#kdelibs: +# @[ `echo " $$INSTALLED " | grep -c " $@ "` -eq 0 ] && \ +# { echo -n "$@ "; \ +# [ "$(MULTILANGUAGE)" != "" ] && for l in $(MULTILANGUAGE); do echo -n "kde-l10n-$$l "; done; \ +# [ ! "$(LANGUAGE)" = "" ] && [ ! "$(LANGUAGE)" = "en" ] && echo -n "kde-l10n-$(LANGUAGE) "; } || : calligra-core: @[ `echo " $$INSTALLED " | grep -c " $@ "` -eq 0 ] && \ { echo -n "$@ "; \ diff --git a/Makefile.defs b/Makefile.defs index 4218f05..1d5a375 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -92,7 +92,7 @@ libvdpau_trace.so.1 = libvdpau xorgdrvvideo = xorg-drv-video-ast xorg-drv-video-ati xorg-drv-video-cirrus xorg-drv-video-dummy xorg-drv-video-fbdev \ xorg-drv-video-intel xorg-drv-video-mach64 xorg-drv-video-mga xorg-drv-video-neomagic xorg-drv-video-nouveau \ xorg-drv-video-openchrome xorg-drv-video-r128 xorg-drv-video-s3virge xorg-drv-video-savage xf86-video-modesetting \ - xorg-drv-video-v4l xorg-drv-video-vesa xorg-drv-video-vmware xorg-drv-video-voodoo $(xorgproprietary) + xorg-drv-video-v4l xorg-drv-video-vesa xorg-drv-video-vmware xorg-drv-video-voodoo xorg-drv-video-amdgpu $(xorgproprietary) # xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx xorg-drv-video-vboxvideo bootloader = syslinux endif diff --git a/makedist.inc.sh b/makedist.inc.sh index 695c066..757d7e3 100644 --- a/makedist.inc.sh +++ b/makedist.inc.sh @@ -13,8 +13,10 @@ create_rpm_database create_devices echo "Installing preparation packages..." -install_rpms "filesystem gzip texinfo ldconfig bash libreadline glibc libncurses initscripts setup coreutils chkconfig \ -libattr libstdc++6 libpam pam" "--nodeps --noorder --noscripts" +install_rpms "filesystem shadow gzip texinfo ldconfig bash libreadline glibc libncurses setup coreutils chkconfig \ +libcap libaudit libselinux libsepol libpcre libcap-ng libattr libstdc++6 libpam" "--nodeps --noorder --noscripts" +# pam initscripts +chroot $MOUNTDIR /usr/sbin/update-alternatives --install /bin/sh sh /bin/bash 20 [ "$LANGUAGE" ] && { diff --git a/platforms/flash-server/post.inc.sh b/platforms/flash-server/post.inc.sh index b129a30..4bc69cb 100644 --- a/platforms/flash-server/post.inc.sh +++ b/platforms/flash-server/post.inc.sh @@ -28,9 +28,6 @@ mv $MOUNTDIR/etc/shadow $MOUNTDIR/etc/shadow.preinst cat $MOUNTDIR/etc/shadow.tmp $MOUNTDIR/etc/shadow.orig > $MOUNTDIR/etc/shadow rm -f $MOUNTDIR/etc/shadow.tmp $MOUNTDIR/etc/shadow.orig -prelink +#prelink extlinux --install $MOUNTDIR/boot - -#echo "Performing binaries prelinking..." -#chroot $MOUNTDIR /bin/bash -c "PRELINK_NOINITCHECK=1 /etc/cron.daily/prelink" diff --git a/platforms/livecd-gnome-root/Makefile b/platforms/livecd-gnome-root/Makefile index 57a644b..6a39542 100644 --- a/platforms/livecd-gnome-root/Makefile +++ b/platforms/livecd-gnome-root/Makefile @@ -3,7 +3,7 @@ $(MAKEDIST_TARGET)-livecd-gnome: \ ppp minicom locales mc alsa-utils \ man-db curl zip unzip iptables iproute mtd-utils nfs-utils \ openssh-clients binutils telnet ftp debianutils diffutils bluez traceroute \ - timezone sudo openobex liblame expect prelink NetworkManager \ + timezone sudo openobex liblame expect NetworkManager \ ModemManager network-manager-applet Mesa-tools \ x11vnc xorg-server xorg-drv-video-fbdev xorg-drv-input-evdev xorg-drv-input-keyboard \ xorg-drv-input-mouse xorg-drv-input-void \ diff --git a/platforms/livecd-gnome-root/post.inc.sh b/platforms/livecd-gnome-root/post.inc.sh index ed8190d..b22721b 100644 --- a/platforms/livecd-gnome-root/post.inc.sh +++ b/platforms/livecd-gnome-root/post.inc.sh @@ -50,4 +50,4 @@ for f in ChangeLog Changelog CHANGES TODO NEWS README README.txt; do find $MOUNTDIR/usr/share/doc -name $f -exec rm -f {} \; done -prelink +#prelink diff --git a/platforms/livecd-light-root/Makefile b/platforms/livecd-light-root/Makefile index 8123b8f..aa29eb2 100644 --- a/platforms/livecd-light-root/Makefile +++ b/platforms/livecd-light-root/Makefile @@ -3,7 +3,7 @@ $(MAKEDIST_TARGET)-livecd-light: openssh-server usbutils wireless_tools parted i man-db curl zip unzip iptables iproute wpa_supplicant mtd-utils nfs-utils \ openssh-clients binutils telnet ftp debianutils diffutils bluez traceroute \ lxde timezone sudo vixie-cron logrotate \ - openobex liblame expect prelink NetworkManager ModemManager \ + openobex liblame expect NetworkManager ModemManager \ network-manager-applet Mesa-tools \ x11vnc xorg-server xorg-drv-video-fbdev xorg-drv-input-evdev xorg-drv-input-keyboard \ xorg-drv-input-mouse xorg-drv-input-void \ diff --git a/platforms/livecd-light-root/post.inc.sh b/platforms/livecd-light-root/post.inc.sh index e9a9f03..1b706d4 100644 --- a/platforms/livecd-light-root/post.inc.sh +++ b/platforms/livecd-light-root/post.inc.sh @@ -36,4 +36,4 @@ for f in ChangeLog Changelog CHANGES TODO NEWS README README.txt; do find $MOUNTDIR/usr/share/doc -name $f -exec rm -f {} \; done -prelink +#prelink diff --git a/platforms/livecd-root/Makefile b/platforms/livecd-root/Makefile index e254799..ecb5818 100644 --- a/platforms/livecd-root/Makefile +++ b/platforms/livecd-root/Makefile @@ -16,15 +16,13 @@ $(MAKEDIST_TARGET)-livecd-root: \ samba-server sddm \ mambatray smart \ $(MAKEDIST_TARGET)-livecd-kde -# smart-gui # Localization targets -$(MAKEDIST_TARGET)-livecd-root-en: \ - kde-l10n-en_GB -$(MAKEDIST_TARGET)-livecd-root-es: \ - kde-l10n-es -# firefox-i18n-es-ES -$(MAKEDIST_TARGET)-livecd-root-it: \ - kde-l10n-it -# firefox-i18n-it -# FIXME: add kdepim +#$(MAKEDIST_TARGET)-livecd-root-en: \ +# kde-l10n-en_GB +#$(MAKEDIST_TARGET)-livecd-root-es: \ +# kde-l10n-es +## firefox-i18n-es-ES +#$(MAKEDIST_TARGET)-livecd-root-it: \ +# kde-l10n-it +## firefox-i18n-it diff --git a/platforms/livecd-root/post.inc.sh b/platforms/livecd-root/post.inc.sh index 2cea48c..4061b8b 100644 --- a/platforms/livecd-root/post.inc.sh +++ b/platforms/livecd-root/post.inc.sh @@ -44,4 +44,4 @@ done #echo "Sleeping 6000" #sleep 6000 -prelink +#prelink diff --git a/platforms/livedvd-root/Makefile b/platforms/livedvd-root/Makefile index bd13849..3cf8f13 100644 --- a/platforms/livedvd-root/Makefile +++ b/platforms/livedvd-root/Makefile @@ -16,16 +16,16 @@ $(MAKEDIST_TARGET)-livedvd-root: \ mambatray sddm \ $(MAKEDIST_TARGET)-livedvd-kde testdisk photorec # Localization targets -$(MAKEDIST_TARGET)-livedvd-root-en: \ - kde-l10n-en_GB -$(MAKEDIST_TARGET)-livedvd-root-es: \ - kde-l10n-es -$(MAKEDIST_TARGET)-livedvd-root-fr: \ - kde-l10n-fr -$(MAKEDIST_TARGET)-livedvd-root-it: \ - kde-l10n-it -$(MAKEDIST_TARGET)-livedvd-root-de: \ - kde-l10n-de +#$(MAKEDIST_TARGET)-livedvd-root-en: \ +# kde-l10n-en_GB +#$(MAKEDIST_TARGET)-livedvd-root-es: \ +# kde-l10n-es +#$(MAKEDIST_TARGET)-livedvd-root-fr: \ +# kde-l10n-fr +#$(MAKEDIST_TARGET)-livedvd-root-it: \ +# kde-l10n-it +#$(MAKEDIST_TARGET)-livedvd-root-de: \ +# kde-l10n-de # FIXME: add kdepim syslog-ng: @echo diff --git a/platforms/livedvd-root/post.inc.sh b/platforms/livedvd-root/post.inc.sh index 20c8982..2900961 100644 --- a/platforms/livedvd-root/post.inc.sh +++ b/platforms/livedvd-root/post.inc.sh @@ -29,4 +29,4 @@ for f in $MOUNTDIR/boot/initramfs-*.img*; do *) rm -f $f ;; esac done -prelink +#prelink diff --git a/platforms/livegames-root/Makefile b/platforms/livegames-root/Makefile index 6e228aa..dad6603 100644 --- a/platforms/livegames-root/Makefile +++ b/platforms/livegames-root/Makefile @@ -31,10 +31,10 @@ $(MAKEDIST_TARGET)-livegames-root: \ $(MAKEDIST_TARGET)-livegames-kde4 # Localization targets -$(MAKEDIST_TARGET)-livegames-root-en: \ - kde-l10n-en_GB -$(MAKEDIST_TARGET)-livegames-root-it: \ - kde-l10n-it -$(MAKEDIST_TARGET)-livegames-root-es: \ - kde-l10n-es +#$(MAKEDIST_TARGET)-livegames-root-en: \ +# kde-l10n-en_GB +#$(MAKEDIST_TARGET)-livegames-root-it: \ +# kde-l10n-it +#$(MAKEDIST_TARGET)-livegames-root-es: \ +# kde-l10n-es # FIXME: add kdepim diff --git a/platforms/livegames-root/post.inc.sh b/platforms/livegames-root/post.inc.sh index 84550df..8c7becc 100644 --- a/platforms/livegames-root/post.inc.sh +++ b/platforms/livegames-root/post.inc.sh @@ -14,4 +14,4 @@ for f in $MOUNTDIR/boot/initramfs-*.img*; do esac done -prelink +#prelink diff --git a/platforms/rootfs-light/Makefile b/platforms/rootfs-light/Makefile index 8079e34..7fbf4d4 100644 --- a/platforms/rootfs-light/Makefile +++ b/platforms/rootfs-light/Makefile @@ -14,7 +14,7 @@ $(MAKEDIST_TARGET)-$(PLATFORM): $(MAKEDIST_TARGET)-devel \ man-db curl zip unzip iptables iproute wpa_supplicant mtd-utils nfs-utils \ openssh-clients binutils telnet ftp debianutils diffutils bluez traceroute \ timezone sudo kmod vixie-cron logrotate rsync postfix \ - liblame expect prelink NetworkManager ModemManager NetworkManager-openvpn \ + liblame expect NetworkManager ModemManager NetworkManager-openvpn \ procps xorg-server x11vnc xkeyboard-config \ xorg-drv-input-tslib xcursor-transparent-theme rpm smart xdg-utils \ dhcp-server rfkill plymouth live-user-environment \ diff --git a/platforms/rootfs-light/post.inc.sh b/platforms/rootfs-light/post.inc.sh index d0eb1e7..2dd0b22 100644 --- a/platforms/rootfs-light/post.inc.sh +++ b/platforms/rootfs-light/post.inc.sh @@ -65,4 +65,4 @@ _EOF # configure default liveuser password echo "openmamba" | chroot $MOUNTDIR passwd liveuser --stdin -prelink +#prelink diff --git a/platforms/rootfs/Makefile b/platforms/rootfs/Makefile index 6d202b9..2ae889e 100644 --- a/platforms/rootfs/Makefile +++ b/platforms/rootfs/Makefile @@ -25,7 +25,7 @@ $(MAKEDIST_TARGET)-$(PLATFORM): $(MAKEDIST_TARGET)-devel \ man-db curl zip unzip iptables iproute wpa_supplicant mtd-utils nfs-utils \ openssh-clients binutils telnet ftp debianutils diffutils bluez traceroute \ timezone sudo kmod vixie-cron logrotate rsync postfix \ - liblame expect prelink NetworkManager ModemManager procps \ + liblame expect NetworkManager ModemManager procps \ xorg-server x11vnc xkeyboard-config screen \ xorg-drv-input-tslib xcursor-transparent-theme rpm smart xdg-utils \ dhcp-server rfkill plymouth live-user-environment \ @@ -41,9 +41,9 @@ $(MAKEDIST_TARGET)-$(PLATFORM): $(MAKEDIST_TARGET)-devel \ # NetworkManager strace gpsd # Localization targets -$(MAKEDIST_TARGET)-$(PLATFORM)-en: \ - kde-l10n-en_GB -$(MAKEDIST_TARGET)-$(PLATFORM)-es: \ - kde-l10n-es -$(MAKEDIST_TARGET)-$(PLATFORM)-it: \ - kde-l10n-it +#$(MAKEDIST_TARGET)-$(PLATFORM)-en: \ +# kde-l10n-en_GB +#$(MAKEDIST_TARGET)-$(PLATFORM)-es: \ +# kde-l10n-es +#$(MAKEDIST_TARGET)-$(PLATFORM)-it: \ +# kde-l10n-it diff --git a/platforms/rootfs/post.inc.sh b/platforms/rootfs/post.inc.sh index 9b4ea8a..a5f8bd7 100644 --- a/platforms/rootfs/post.inc.sh +++ b/platforms/rootfs/post.inc.sh @@ -70,4 +70,4 @@ _EOF # configure default liveuser password echo "openmamba" | chroot $MOUNTDIR passwd liveuser --stdin -prelink +#prelink diff --git a/platforms/testcd-root/Makefile b/platforms/testcd-root/Makefile index df38786..c60e466 100644 --- a/platforms/testcd-root/Makefile +++ b/platforms/testcd-root/Makefile @@ -18,12 +18,12 @@ $(MAKEDIST_TARGET)-testcd-root: \ # smart-gui # Localization targets -$(MAKEDIST_TARGET)-testcd-root-en: \ - kde-l10n-en_GB -$(MAKEDIST_TARGET)-testcd-root-es: \ - kde-l10n-es -# firefox-i18n-es-ES -$(MAKEDIST_TARGET)-testcd-root-it: \ - kde-l10n-it +#$(MAKEDIST_TARGET)-testcd-root-en: \ +# kde-l10n-en_GB +#$(MAKEDIST_TARGET)-testcd-root-es: \ +# kde-l10n-es +## firefox-i18n-es-ES +#$(MAKEDIST_TARGET)-testcd-root-it: \ +# kde-l10n-it # firefox-i18n-it # FIXME: add kdepim diff --git a/platforms/testcd-root/post.inc.sh b/platforms/testcd-root/post.inc.sh index ab08f41..f7d3692 100644 --- a/platforms/testcd-root/post.inc.sh +++ b/platforms/testcd-root/post.inc.sh @@ -31,4 +31,4 @@ for f in ChangeLog Changelog CHANGES TODO NEWS README README.txt; do find $MOUNTDIR/usr/share/doc -name $f -exec rm -f {} \; done -prelink +#prelink diff --git a/platforms/virtualserver/post.inc.sh b/platforms/virtualserver/post.inc.sh index b129a30..4bc69cb 100644 --- a/platforms/virtualserver/post.inc.sh +++ b/platforms/virtualserver/post.inc.sh @@ -28,9 +28,6 @@ mv $MOUNTDIR/etc/shadow $MOUNTDIR/etc/shadow.preinst cat $MOUNTDIR/etc/shadow.tmp $MOUNTDIR/etc/shadow.orig > $MOUNTDIR/etc/shadow rm -f $MOUNTDIR/etc/shadow.tmp $MOUNTDIR/etc/shadow.orig -prelink +#prelink extlinux --install $MOUNTDIR/boot - -#echo "Performing binaries prelinking..." -#chroot $MOUNTDIR /bin/bash -c "PRELINK_NOINITCHECK=1 /etc/cron.daily/prelink"