diff --git a/Makefile b/Makefile index 3a2ed93..665d48c 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ $(MAKEDIST_TARGET)-devel: : $(MAKEDIST_TARGET)-base: filesystem gzip texinfo ldconfig bash libreadline libreadline6 glibc \ ncurses systemd setup coreutils rootfiles chkconfig \ - udev debianutils openmamba-release + udev debianutils openmamba-release dracut # splashutils $(MAKEDIST_TARGET)-firmwares: ipw2100-firmware ipw2200-firmware zd1211-firmware radeon-firmware \ rt2501-firmware rt2860-firmware rt2870-firmware r5u87x-firmware diff --git a/Makefile.defs b/Makefile.defs index 1d5a375..2ff6538 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -13,6 +13,12 @@ _initsystem = systemd /sbin/shutdown = $(_initsystem) /sbin/telinit = $(_initsystem) +# util-linux vs. shadow-extra +/bin/su = util-linux +/sbin/nologin = util-linux +/usr/bin/chfn = util-linux +/usr/bin/chsh = util-linux + #xorgproprietary = xorg-drv-video-fglrx xorg-drv-video-nvidia ifneq ($(ARCH),arm) diff --git a/platforms/livecd-root/Makefile b/platforms/livecd-root/Makefile index ecb5818..f383f52 100644 --- a/platforms/livecd-root/Makefile +++ b/platforms/livecd-root/Makefile @@ -1,7 +1,7 @@ -$(MAKEDIST_TARGET)-livecd-kde: desktop-base-kde kmix bluedevil5 kwalletmanager +$(MAKEDIST_TARGET)-livecd-kde: desktop-base-kde bluedevil5 kwalletmanager # smb4k juk kate dragon ksnapshot okular kppp krfb ark kcalc kdf kgpg kopete -$(MAKEDIST_TARGET)-livecd-libreoffice: libreoffice-Calc libreoffice-writer libreofice-impress +$(MAKEDIST_TARGET)-livecd-libreoffice: libreoffice-calc libreoffice-writer libreofice-impress $(MAKEDIST_TARGET)-livecd-root: \ postplug-xorg postplug-sound openssh-server \ @@ -11,7 +11,7 @@ $(MAKEDIST_TARGET)-livecd-root: \ ttf-freefont liberation-fonts-ttf \ gparted ntfs-3g libdvdcss \ chromium vixie-cron logrotate \ - macbook-tools livecd-tools \ + livecd-tools \ Mesa-tools driconf parted testdisk \ samba-server sddm \ mambatray smart \ diff --git a/platforms/livedvd-root/Makefile b/platforms/livedvd-root/Makefile index 3cf8f13..a2d5920 100644 --- a/platforms/livedvd-root/Makefile +++ b/platforms/livedvd-root/Makefile @@ -1,5 +1,5 @@ $(MAKEDIST_TARGET)-livedvd-kde: desktop-base-kde krfb ark kcalc kdf kgpg \ - ksnapshot okular kontact kmail akregator kmix \ + ksnapshot okular kontact kmail akregator \ kopete bluedevil5 smb4k amarok kwalletmanager dragon kate $(MAKEDIST_TARGET)-livedvd-libreoffice: libreoffice-calc libreoffice-writer libreoffice-impress @@ -16,16 +16,11 @@ $(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: +$(MAKEDIST_TARGET)-livedvd-root-es: +$(MAKEDIST_TARGET)-livedvd-root-fr: +$(MAKEDIST_TARGET)-livedvd-root-it: +$(MAKEDIST_TARGET)-livedvd-root-de: # FIXME: add kdepim syslog-ng: @echo diff --git a/platforms/livedvd-root/post.inc.sh b/platforms/livedvd-root/post.inc.sh index 2900961..4ed0e6b 100644 --- a/platforms/livedvd-root/post.inc.sh +++ b/platforms/livedvd-root/post.inc.sh @@ -1,10 +1,10 @@ # FIXME: ensure alternatives are correclty set chroot $MOUNTDIR update-alternatives-set-dri -# configure favorites in kde menu -for f in /usr/share/applications/chromium.desktop /opt/kde/share/applications/amarok.desktop; do - chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f -done +## configure favorites in kde menu +#for f in /usr/share/applications/chromium.desktop /opt/kde/share/applications/amarok.desktop; do +# chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f +#done # install icon on liveuser desktop chroot $MOUNTDIR cp /usr/share/applications/openmamba-installer.desktop /home/liveuser/Desktop/ @@ -18,9 +18,10 @@ clean_rpm_database virtualbox_ver=`ls -d $MOUNTDIR/usr/src/vboxvideo-* | sed "s|.*-||"` for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do - # pre-create video drivers for VirtualBox - chroot $MOUNTDIR dkms install -q -m vboxguest -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force - chroot $MOUNTDIR dkms install -q -m vboxvideo -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force + for m in vboxdrv vboxguest vboxnetadp vboxnetflt vboxpci vboxvideo; do + # pre-create video drivers for VirtualBox + chroot $MOUNTDIR dkms install -q -m $m -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force + done done # remove unused initramfs generated by kernel for f in $MOUNTDIR/boot/initramfs-*.img*; do diff --git a/platforms/livegames-root/Makefile b/platforms/livegames-root/Makefile index dad6603..1b41fb4 100644 --- a/platforms/livegames-root/Makefile +++ b/platforms/livegames-root/Makefile @@ -1,5 +1,5 @@ -$(MAKEDIST_TARGET)-livegames-kde4: kppp krfb ark kcalc kdf kfloppy kgpg desktop-base-kde4 \ - ksnapshot okular kontact kmail akregator desktop-base-kde4 kmix \ +$(MAKEDIST_TARGET)-livegames-kde4: kppp krfb ark kcalc kdf kfloppy kgpg \ + ksnapshot okular kontact kmail akregator desktop-base-kde \ kopete bliedevil smb4k kate \ kruler gwenview4 kamera kcolorchooser kwalletmanager \ bomber bovo granatier kapman katomic kbattleship kblackbox kblocks kbounce \ diff --git a/platforms/rootfs/Makefile b/platforms/rootfs/Makefile index 2ae889e..d495c4a 100644 --- a/platforms/rootfs/Makefile +++ b/platforms/rootfs/Makefile @@ -1,8 +1,7 @@ $(MAKEDIST_TARGET)-$(PLATFORM)-kde4: \ - kppp desktop-base-kde4 \ - ksnapshot okular desktop-base-kde4 kmix \ + kppp desktop-base-kde ksnapshot okular \ kopete bluedevil smb4k juk kwalletmanager \ - libqt4-sqlite kate ark kcalc kdf kgpg kaffeine kamoso + sqlite kate ark kcalc kdf kgpg kaffeine kamoso $(MAKEDIST_TARGET)-$(PLATFORM)-arm: \ kernel-iconia kernel-iconia-modules kernel-hannspad kernel-hannspad-modules \ diff --git a/platforms/testcd-root/Makefile b/platforms/testcd-root/Makefile index c60e466..987c10f 100644 --- a/platforms/testcd-root/Makefile +++ b/platforms/testcd-root/Makefile @@ -1,4 +1,4 @@ -$(MAKEDIST_TARGET)-testcd-kde4: desktop-base-kde4 kmix bluedevil kwalletmanager +$(MAKEDIST_TARGET)-testcd-kde4: desktop-base-kde bluedevil kwalletmanager # kopete dragon kate smb4k juk ksnapshot okular kontact kmail akregator kppp krfb ark kcalc kdf kgpg $(MAKEDIST_TARGET)-testcd-libreoffice: libreoffice-calc libreoffice-writer libreoffice-impress