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

Some packages updates for KDE Plasma 5 and other fixes for livedvd, rootfs-base, etc. long time broken targets

Browse Source
This commit is contained in:
Silvan Calarco 2018-02-10 15:22:04 +01:00
parent d0d0d3de6d
commit 4be8d57b64
8 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -5,7 +5,7 @@ $(MAKEDIST_TARGET)-devel:
: :
$(MAKEDIST_TARGET)-base: filesystem gzip texinfo ldconfig bash libreadline libreadline6 glibc \ $(MAKEDIST_TARGET)-base: filesystem gzip texinfo ldconfig bash libreadline libreadline6 glibc \
ncurses systemd setup coreutils rootfiles chkconfig \ ncurses systemd setup coreutils rootfiles chkconfig \
udev debianutils openmamba-release udev debianutils openmamba-release dracut
# splashutils # splashutils
$(MAKEDIST_TARGET)-firmwares: ipw2100-firmware ipw2200-firmware zd1211-firmware radeon-firmware \ $(MAKEDIST_TARGET)-firmwares: ipw2100-firmware ipw2200-firmware zd1211-firmware radeon-firmware \
rt2501-firmware rt2860-firmware rt2870-firmware r5u87x-firmware rt2501-firmware rt2860-firmware rt2870-firmware r5u87x-firmware

6
Makefile.defs
View File

@ -13,6 +13,12 @@ _initsystem = systemd
/sbin/shutdown = $(_initsystem) /sbin/shutdown = $(_initsystem)
/sbin/telinit = $(_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 #xorgproprietary = xorg-drv-video-fglrx xorg-drv-video-nvidia
ifneq ($(ARCH),arm) ifneq ($(ARCH),arm)

6
platforms/livecd-root/Makefile
View File

@ -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 # 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: \ $(MAKEDIST_TARGET)-livecd-root: \
postplug-xorg postplug-sound openssh-server \ postplug-xorg postplug-sound openssh-server \
@ -11,7 +11,7 @@ $(MAKEDIST_TARGET)-livecd-root: \
ttf-freefont liberation-fonts-ttf \ ttf-freefont liberation-fonts-ttf \
gparted ntfs-3g libdvdcss \ gparted ntfs-3g libdvdcss \
chromium vixie-cron logrotate \ chromium vixie-cron logrotate \
macbook-tools livecd-tools \ livecd-tools \
Mesa-tools driconf parted testdisk \ Mesa-tools driconf parted testdisk \
samba-server sddm \ samba-server sddm \
mambatray smart \ mambatray smart \

17
platforms/livedvd-root/Makefile
View File

@ -1,5 +1,5 @@
$(MAKEDIST_TARGET)-livedvd-kde: desktop-base-kde krfb ark kcalc kdf kgpg \ $(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 kopete bluedevil5 smb4k amarok kwalletmanager dragon kate
$(MAKEDIST_TARGET)-livedvd-libreoffice: libreoffice-calc libreoffice-writer libreoffice-impress $(MAKEDIST_TARGET)-livedvd-libreoffice: libreoffice-calc libreoffice-writer libreoffice-impress
@ -16,16 +16,11 @@ $(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 $(MAKEDIST_TARGET)-livedvd-root-es:
#$(MAKEDIST_TARGET)-livedvd-root-es: \ $(MAKEDIST_TARGET)-livedvd-root-fr:
# kde-l10n-es $(MAKEDIST_TARGET)-livedvd-root-it:
#$(MAKEDIST_TARGET)-livedvd-root-fr: \ $(MAKEDIST_TARGET)-livedvd-root-de:
# kde-l10n-fr
#$(MAKEDIST_TARGET)-livedvd-root-it: \
# kde-l10n-it
#$(MAKEDIST_TARGET)-livedvd-root-de: \
# kde-l10n-de
# FIXME: add kdepim # FIXME: add kdepim
syslog-ng: syslog-ng:
@echo @echo

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

@ -1,10 +1,10 @@
# FIXME: ensure alternatives are correclty set # FIXME: ensure alternatives are correclty set
chroot $MOUNTDIR update-alternatives-set-dri chroot $MOUNTDIR update-alternatives-set-dri
# configure favorites in kde menu ## configure favorites in kde menu
for f in /usr/share/applications/chromium.desktop /opt/kde/share/applications/amarok.desktop; do #for f in /usr/share/applications/chromium.desktop /opt/kde/share/applications/amarok.desktop; do
chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f # chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f
done #done
# install icon on liveuser desktop # install icon on liveuser desktop
chroot $MOUNTDIR cp /usr/share/applications/openmamba-installer.desktop /home/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|.*-||"` virtualbox_ver=`ls -d $MOUNTDIR/usr/src/vboxvideo-* | sed "s|.*-||"`
for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
for m in vboxdrv vboxguest vboxnetadp vboxnetflt vboxpci vboxvideo; do
# pre-create video drivers for VirtualBox # 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 $m -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force
chroot $MOUNTDIR dkms install -q -m vboxvideo -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force done
done done
# remove unused initramfs generated by kernel # remove unused initramfs generated by kernel
for f in $MOUNTDIR/boot/initramfs-*.img*; do for f in $MOUNTDIR/boot/initramfs-*.img*; do

4
platforms/livegames-root/Makefile
View File

@ -1,5 +1,5 @@
$(MAKEDIST_TARGET)-livegames-kde4: kppp krfb ark kcalc kdf kfloppy kgpg desktop-base-kde4 \ $(MAKEDIST_TARGET)-livegames-kde4: kppp krfb ark kcalc kdf kfloppy kgpg \
ksnapshot okular kontact kmail akregator desktop-base-kde4 kmix \ ksnapshot okular kontact kmail akregator desktop-base-kde \
kopete bliedevil smb4k kate \ kopete bliedevil smb4k kate \
kruler gwenview4 kamera kcolorchooser kwalletmanager \ kruler gwenview4 kamera kcolorchooser kwalletmanager \
bomber bovo granatier kapman katomic kbattleship kblackbox kblocks kbounce \ bomber bovo granatier kapman katomic kbattleship kblackbox kblocks kbounce \

5
platforms/rootfs/Makefile
View File

@ -1,8 +1,7 @@
$(MAKEDIST_TARGET)-$(PLATFORM)-kde4: \ $(MAKEDIST_TARGET)-$(PLATFORM)-kde4: \
kppp desktop-base-kde4 \ kppp desktop-base-kde ksnapshot okular \
ksnapshot okular desktop-base-kde4 kmix \
kopete bluedevil smb4k juk kwalletmanager \ 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: \ $(MAKEDIST_TARGET)-$(PLATFORM)-arm: \
kernel-iconia kernel-iconia-modules kernel-hannspad kernel-hannspad-modules \ kernel-iconia kernel-iconia-modules kernel-hannspad kernel-hannspad-modules \

2
platforms/testcd-root/Makefile
View File

@ -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 # 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 $(MAKEDIST_TARGET)-testcd-libreoffice: libreoffice-calc libreoffice-writer libreoffice-impress