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

Changes following KDE 5 Plasma support

Browse Source
This commit is contained in:
Silvan Calarco 2018-01-29 12:55:39 +01:00
parent 80e0133188
commit d0d0d3de6d
21 changed files with 62 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -12,7 +12,7 @@ $(MAKEDIST_TARGET)-firmwares: ipw2100-firmware ipw2200-firmware zd1211-firmware
$(MAKEDIST_TARGET)-commontools: $(_init_system) util-linux kmod \ $(MAKEDIST_TARGET)-commontools: $(_init_system) util-linux kmod \
procps sed grep tar bzip2 unzip zip pciutils lshw \ procps sed grep tar bzip2 unzip zip pciutils lshw \
pam shadow-common pwdutils acpid screen \ 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 \ wireless_tools wpa_supplicant openmamba-release refit-tools openssh-clients \
dosfstools man mbr iptables cups vim iputils sudo postplug less \ dosfstools man mbr iptables cups vim iputils sudo postplug less \
reiserfsprogs ppp b43-tools mdadm usb-modeswitch \ reiserfsprogs ppp b43-tools mdadm usb-modeswitch \
@ -37,11 +37,11 @@ endif
# { echo -n "$@ "; \ # { echo -n "$@ "; \
# [ "$(MULTILANGUAGE)" ] && for l in $(MULTILANGUAGE); do echo -n "kde-i18n-$$l "; done; \ # [ "$(MULTILANGUAGE)" ] && for l in $(MULTILANGUAGE); do echo -n "kde-i18n-$$l "; done; \
# [ ! "$(LANGUAGE)" = "" ] && [ ! "$(LANGUAGE)" = "en" ] && echo -n "kde-i18n-$(LANGUAGE) "; } || : # [ ! "$(LANGUAGE)" = "" ] && [ ! "$(LANGUAGE)" = "en" ] && echo -n "kde-i18n-$(LANGUAGE) "; } || :
kdelibs: #kdelibs:
@[ `echo " $$INSTALLED " | grep -c " $@ "` -eq 0 ] && \ # @[ `echo " $$INSTALLED " | grep -c " $@ "` -eq 0 ] && \
{ echo -n "$@ "; \ # { echo -n "$@ "; \
[ "$(MULTILANGUAGE)" != "" ] && for l in $(MULTILANGUAGE); do echo -n "kde-l10n-$$l "; done; \ # [ "$(MULTILANGUAGE)" != "" ] && for l in $(MULTILANGUAGE); do echo -n "kde-l10n-$$l "; done; \
[ ! "$(LANGUAGE)" = "" ] && [ ! "$(LANGUAGE)" = "en" ] && echo -n "kde-l10n-$(LANGUAGE) "; } || : # [ ! "$(LANGUAGE)" = "" ] && [ ! "$(LANGUAGE)" = "en" ] && echo -n "kde-l10n-$(LANGUAGE) "; } || :
calligra-core: calligra-core:
@[ `echo " $$INSTALLED " | grep -c " $@ "` -eq 0 ] && \ @[ `echo " $$INSTALLED " | grep -c " $@ "` -eq 0 ] && \
{ echo -n "$@ "; \ { echo -n "$@ "; \

2
Makefile.defs
View File

@ -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 \ 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-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-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 # xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx xorg-drv-video-vboxvideo
bootloader = syslinux bootloader = syslinux
endif endif

6
makedist.inc.sh
View File

@ -13,8 +13,10 @@ create_rpm_database
create_devices create_devices
echo "Installing preparation packages..." echo "Installing preparation packages..."
install_rpms "filesystem gzip texinfo ldconfig bash libreadline glibc libncurses initscripts setup coreutils chkconfig \ install_rpms "filesystem shadow gzip texinfo ldconfig bash libreadline glibc libncurses setup coreutils chkconfig \
libattr libstdc++6 libpam pam" "--nodeps --noorder --noscripts" 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" ] && { [ "$LANGUAGE" ] && {

5
platforms/flash-server/post.inc.sh
View File

@ -28,9 +28,6 @@ mv $MOUNTDIR/etc/shadow $MOUNTDIR/etc/shadow.preinst
cat $MOUNTDIR/etc/shadow.tmp $MOUNTDIR/etc/shadow.orig > $MOUNTDIR/etc/shadow cat $MOUNTDIR/etc/shadow.tmp $MOUNTDIR/etc/shadow.orig > $MOUNTDIR/etc/shadow
rm -f $MOUNTDIR/etc/shadow.tmp $MOUNTDIR/etc/shadow.orig rm -f $MOUNTDIR/etc/shadow.tmp $MOUNTDIR/etc/shadow.orig
prelink #prelink
extlinux --install $MOUNTDIR/boot extlinux --install $MOUNTDIR/boot
#echo "Performing binaries prelinking..."
#chroot $MOUNTDIR /bin/bash -c "PRELINK_NOINITCHECK=1 /etc/cron.daily/prelink"

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

@ -3,7 +3,7 @@ $(MAKEDIST_TARGET)-livecd-gnome: \
ppp minicom locales mc alsa-utils \ ppp minicom locales mc alsa-utils \
man-db curl zip unzip iptables iproute mtd-utils nfs-utils \ man-db curl zip unzip iptables iproute mtd-utils nfs-utils \
openssh-clients binutils telnet ftp debianutils diffutils bluez traceroute \ 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 \ ModemManager network-manager-applet Mesa-tools \
x11vnc xorg-server xorg-drv-video-fbdev xorg-drv-input-evdev xorg-drv-input-keyboard \ x11vnc xorg-server xorg-drv-video-fbdev xorg-drv-input-evdev xorg-drv-input-keyboard \
xorg-drv-input-mouse xorg-drv-input-void \ xorg-drv-input-mouse xorg-drv-input-void \

2
platforms/livecd-gnome-root/post.inc.sh
View File

@ -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 {} \; find $MOUNTDIR/usr/share/doc -name $f -exec rm -f {} \;
done done
prelink #prelink

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

@ -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 \ man-db curl zip unzip iptables iproute wpa_supplicant mtd-utils nfs-utils \
openssh-clients binutils telnet ftp debianutils diffutils bluez traceroute \ openssh-clients binutils telnet ftp debianutils diffutils bluez traceroute \
lxde timezone sudo vixie-cron logrotate \ lxde timezone sudo vixie-cron logrotate \
openobex liblame expect prelink NetworkManager ModemManager \ openobex liblame expect NetworkManager ModemManager \
network-manager-applet Mesa-tools \ network-manager-applet Mesa-tools \
x11vnc xorg-server xorg-drv-video-fbdev xorg-drv-input-evdev xorg-drv-input-keyboard \ x11vnc xorg-server xorg-drv-video-fbdev xorg-drv-input-evdev xorg-drv-input-keyboard \
xorg-drv-input-mouse xorg-drv-input-void \ xorg-drv-input-mouse xorg-drv-input-void \

2
platforms/livecd-light-root/post.inc.sh
View File

@ -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 {} \; find $MOUNTDIR/usr/share/doc -name $f -exec rm -f {} \;
done done
prelink #prelink

18
platforms/livecd-root/Makefile
View File

@ -16,15 +16,13 @@ $(MAKEDIST_TARGET)-livecd-root: \
samba-server sddm \ samba-server sddm \
mambatray smart \ mambatray smart \
$(MAKEDIST_TARGET)-livecd-kde $(MAKEDIST_TARGET)-livecd-kde
# smart-gui
# Localization targets # Localization targets
$(MAKEDIST_TARGET)-livecd-root-en: \ #$(MAKEDIST_TARGET)-livecd-root-en: \
kde-l10n-en_GB # kde-l10n-en_GB
$(MAKEDIST_TARGET)-livecd-root-es: \ #$(MAKEDIST_TARGET)-livecd-root-es: \
kde-l10n-es # kde-l10n-es
# firefox-i18n-es-ES ## firefox-i18n-es-ES
$(MAKEDIST_TARGET)-livecd-root-it: \ #$(MAKEDIST_TARGET)-livecd-root-it: \
kde-l10n-it # kde-l10n-it
# firefox-i18n-it ## firefox-i18n-it
# FIXME: add kdepim

2
platforms/livecd-root/post.inc.sh
View File

@ -44,4 +44,4 @@ done
#echo "Sleeping 6000" #echo "Sleeping 6000"
#sleep 6000 #sleep 6000
prelink #prelink

20
platforms/livedvd-root/Makefile
View File

@ -16,16 +16,16 @@ $(MAKEDIST_TARGET)-livedvd-root: \
mambatray sddm \ mambatray sddm \
$(MAKEDIST_TARGET)-livedvd-kde testdisk photorec $(MAKEDIST_TARGET)-livedvd-kde testdisk photorec
# Localization targets # Localization targets
$(MAKEDIST_TARGET)-livedvd-root-en: \ #$(MAKEDIST_TARGET)-livedvd-root-en: \
kde-l10n-en_GB # kde-l10n-en_GB
$(MAKEDIST_TARGET)-livedvd-root-es: \ #$(MAKEDIST_TARGET)-livedvd-root-es: \
kde-l10n-es # kde-l10n-es
$(MAKEDIST_TARGET)-livedvd-root-fr: \ #$(MAKEDIST_TARGET)-livedvd-root-fr: \
kde-l10n-fr # kde-l10n-fr
$(MAKEDIST_TARGET)-livedvd-root-it: \ #$(MAKEDIST_TARGET)-livedvd-root-it: \
kde-l10n-it # kde-l10n-it
$(MAKEDIST_TARGET)-livedvd-root-de: \ #$(MAKEDIST_TARGET)-livedvd-root-de: \
kde-l10n-de # kde-l10n-de
# FIXME: add kdepim # FIXME: add kdepim
syslog-ng: syslog-ng:
@echo @echo

2
platforms/livedvd-root/post.inc.sh
View File

@ -29,4 +29,4 @@ for f in $MOUNTDIR/boot/initramfs-*.img*; do
*) rm -f $f ;; *) rm -f $f ;;
esac esac
done done
prelink #prelink

12
platforms/livegames-root/Makefile
View File

@ -31,10 +31,10 @@ $(MAKEDIST_TARGET)-livegames-root: \
$(MAKEDIST_TARGET)-livegames-kde4 $(MAKEDIST_TARGET)-livegames-kde4
# Localization targets # Localization targets
$(MAKEDIST_TARGET)-livegames-root-en: \ #$(MAKEDIST_TARGET)-livegames-root-en: \
kde-l10n-en_GB # kde-l10n-en_GB
$(MAKEDIST_TARGET)-livegames-root-it: \ #$(MAKEDIST_TARGET)-livegames-root-it: \
kde-l10n-it # kde-l10n-it
$(MAKEDIST_TARGET)-livegames-root-es: \ #$(MAKEDIST_TARGET)-livegames-root-es: \
kde-l10n-es # kde-l10n-es
# FIXME: add kdepim # FIXME: add kdepim

2
platforms/livegames-root/post.inc.sh
View File

@ -14,4 +14,4 @@ for f in $MOUNTDIR/boot/initramfs-*.img*; do
esac esac
done done
prelink #prelink

2
platforms/rootfs-light/Makefile
View File

@ -14,7 +14,7 @@ $(MAKEDIST_TARGET)-$(PLATFORM): $(MAKEDIST_TARGET)-devel \
man-db curl zip unzip iptables iproute wpa_supplicant mtd-utils nfs-utils \ man-db curl zip unzip iptables iproute wpa_supplicant mtd-utils nfs-utils \
openssh-clients binutils telnet ftp debianutils diffutils bluez traceroute \ openssh-clients binutils telnet ftp debianutils diffutils bluez traceroute \
timezone sudo kmod vixie-cron logrotate rsync postfix \ 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 \ procps xorg-server x11vnc xkeyboard-config \
xorg-drv-input-tslib xcursor-transparent-theme rpm smart xdg-utils \ xorg-drv-input-tslib xcursor-transparent-theme rpm smart xdg-utils \
dhcp-server rfkill plymouth live-user-environment \ dhcp-server rfkill plymouth live-user-environment \

2
platforms/rootfs-light/post.inc.sh
View File

@ -65,4 +65,4 @@ _EOF
# configure default liveuser password # configure default liveuser password
echo "openmamba" | chroot $MOUNTDIR passwd liveuser --stdin echo "openmamba" | chroot $MOUNTDIR passwd liveuser --stdin
prelink #prelink

14
platforms/rootfs/Makefile
View File

@ -25,7 +25,7 @@ $(MAKEDIST_TARGET)-$(PLATFORM): $(MAKEDIST_TARGET)-devel \
man-db curl zip unzip iptables iproute wpa_supplicant mtd-utils nfs-utils \ man-db curl zip unzip iptables iproute wpa_supplicant mtd-utils nfs-utils \
openssh-clients binutils telnet ftp debianutils diffutils bluez traceroute \ openssh-clients binutils telnet ftp debianutils diffutils bluez traceroute \
timezone sudo kmod vixie-cron logrotate rsync postfix \ 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-server x11vnc xkeyboard-config screen \
xorg-drv-input-tslib xcursor-transparent-theme rpm smart xdg-utils \ xorg-drv-input-tslib xcursor-transparent-theme rpm smart xdg-utils \
dhcp-server rfkill plymouth live-user-environment \ dhcp-server rfkill plymouth live-user-environment \
@ -41,9 +41,9 @@ $(MAKEDIST_TARGET)-$(PLATFORM): $(MAKEDIST_TARGET)-devel \
# NetworkManager strace gpsd # NetworkManager strace gpsd
# Localization targets # Localization targets
$(MAKEDIST_TARGET)-$(PLATFORM)-en: \ #$(MAKEDIST_TARGET)-$(PLATFORM)-en: \
kde-l10n-en_GB # kde-l10n-en_GB
$(MAKEDIST_TARGET)-$(PLATFORM)-es: \ #$(MAKEDIST_TARGET)-$(PLATFORM)-es: \
kde-l10n-es # kde-l10n-es
$(MAKEDIST_TARGET)-$(PLATFORM)-it: \ #$(MAKEDIST_TARGET)-$(PLATFORM)-it: \
kde-l10n-it # kde-l10n-it

2
platforms/rootfs/post.inc.sh
View File

@ -70,4 +70,4 @@ _EOF
# configure default liveuser password # configure default liveuser password
echo "openmamba" | chroot $MOUNTDIR passwd liveuser --stdin echo "openmamba" | chroot $MOUNTDIR passwd liveuser --stdin
prelink #prelink

14
platforms/testcd-root/Makefile
View File

@ -18,12 +18,12 @@ $(MAKEDIST_TARGET)-testcd-root: \
# smart-gui # smart-gui
# Localization targets # Localization targets
$(MAKEDIST_TARGET)-testcd-root-en: \ #$(MAKEDIST_TARGET)-testcd-root-en: \
kde-l10n-en_GB # kde-l10n-en_GB
$(MAKEDIST_TARGET)-testcd-root-es: \ #$(MAKEDIST_TARGET)-testcd-root-es: \
kde-l10n-es # kde-l10n-es
# firefox-i18n-es-ES ## firefox-i18n-es-ES
$(MAKEDIST_TARGET)-testcd-root-it: \ #$(MAKEDIST_TARGET)-testcd-root-it: \
kde-l10n-it # kde-l10n-it
# firefox-i18n-it # firefox-i18n-it
# FIXME: add kdepim # FIXME: add kdepim

2
platforms/testcd-root/post.inc.sh
View File

@ -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 {} \; find $MOUNTDIR/usr/share/doc -name $f -exec rm -f {} \;
done done
prelink #prelink

5
platforms/virtualserver/post.inc.sh
View File

@ -28,9 +28,6 @@ mv $MOUNTDIR/etc/shadow $MOUNTDIR/etc/shadow.preinst
cat $MOUNTDIR/etc/shadow.tmp $MOUNTDIR/etc/shadow.orig > $MOUNTDIR/etc/shadow cat $MOUNTDIR/etc/shadow.tmp $MOUNTDIR/etc/shadow.orig > $MOUNTDIR/etc/shadow
rm -f $MOUNTDIR/etc/shadow.tmp $MOUNTDIR/etc/shadow.orig rm -f $MOUNTDIR/etc/shadow.tmp $MOUNTDIR/etc/shadow.orig
prelink #prelink
extlinux --install $MOUNTDIR/boot extlinux --install $MOUNTDIR/boot
#echo "Performing binaries prelinking..."
#chroot $MOUNTDIR /bin/bash -c "PRELINK_NOINITCHECK=1 /etc/cron.daily/prelink"