Commit 570d6b2f76f6d1d615216c987184e30fa736a556

Authored by Silvan Calarco
1 parent 3a60182c7e
Exists in master

Sync with changes in openmamba (devel) target

Showing 9 changed files with 32 additions and 45 deletions Side-by-side Diff

... ... @@ -16,7 +16,7 @@
16 16 wireless_tools wpa_supplicant openmamba-release refit-tools openssh-clients \
17 17 dosfstools man mbr iptables cups vim iputils sudo postplug xinetd less \
18 18 reiserfsprogs reiser4progs ppp b43-tools mdadm usb-modeswitch \
19   - ndiswrapper slmodem usbutils ftp telnet eject bluez \
  19 + ndiswrapper slmodem usbutils ftp telnet eject bluez lsof \
20 20 tcpdump pcmcia-utils xdg-utils unionfs_utils iproute $(MAKEDIST_TARGET)-firmwares \
21 21 $(MAKEDIST_TARGET)-devel
22 22 $(MAKEDIST_TARGET)-debug: strace valgrind gdb minicom openssh-server dhcpclient rpm iputils \
... ... @@ -99,6 +99,7 @@
99 99 libkorganizer_eventviewer.so.1 = korganizer
100 100 libsmb4kdialogs.so = smb4k4
101 101  
  102 +perl[B] = perl
102 103 perl[bytes] = perl
103 104 perl[Automake__General] = automake
104 105 perl[Automake__Struct] = automake
105 106  
106 107  
... ... @@ -127,13 +128,20 @@
127 128  
128 129 libgs.so.9 = ghostscript
129 130  
  131 +# ffmpeg / libav
  132 +libpostproc.so.51 = libpostproc-ffmpeg
  133 +libpostproc.so.51[LIBPOSTPROC_51] = libpostproc-ffmpeg
  134 +ffmpegpresets := ffmpeg-presets
  135 +
130 136 # libreoffice
131 137 libreofficei18n = libreoffice-i18n-$(LANGUAGE)
132 138  
133 139 # vpn
134 140 networkmanagervpnplugin = NetworkManager-vpnc NetworkManager-pptp
  141 +knetworkmanagervpnplugin = plasma-applet-networkmanagement-vpnc plasma-applet-networkmanagement-pptp
135 142  
136 143 packagekitgui = kpackagekit
  144 +firewallgui = kcm_ufw
137 145  
138 146 ifdef PLATFORM
139 147 include $(TARGETSDIR)/$(TARGET)/platforms/$(PLATFORM)/Makefile.defs
platforms/livecd-gnome-root/Makefile.defs
1 1 packagekitgui = gnome-packagekit
  2 +firewallgui = gui-ufw
platforms/livecd-gnome-root/post.inc.sh
... ... @@ -45,18 +45,12 @@
45 45 echo $timezone > $MOUNTDIR/etc/timezone
46 46 cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime
47 47  
48   -# prebuild postplug sound CARDID_DB (with some ugly trick to make it work from chroot)
49   -[ -e $MOUNTDIR/lib/modules/`uname -r` ] || ln -s ${KERNEL_MAJVER}${KERNEL_EXTRAVER} $MOUNTDIR/lib/modules/`uname -r`
50   -echo "SOUND_BUILD_CARDID_DB_ONLY=1 /etc/postplug/postplug.d/sound" >> $MOUNTDIR/tmp/sounddb.sh
51   -chroot $MOUNTDIR sh /tmp/sounddb.sh
52   -rm -f $MOUNTDIR/tmp/sounddb.sh
53   -[ -L $MOUNTDIR/lib/modules/`uname -r` ] && rm $MOUNTDIR/lib/modules/`uname -r`
54   -
55   -# remove unused initramfs generated by kernel
56   -rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}.img*
57   -
58   -# remove failsafe image to save space for livecd
59   -rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}-failsafe.img*
  48 +for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
  49 + # remove unused initramfs generated by kernel
  50 + rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${K}.img*
  51 + # remove failsafe image to save space for livecd
  52 + rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}-failsafe.img*
  53 +done
60 54  
61 55 # install all GConf rules
62 56 cat > $MOUNTDIR/tmp/gconftool.sh << _EOF
platforms/livecd-light-root/Makefile.defs
1 1 packagekitgui = gnome-packagekit
  2 +firewallgui = gui-ufw
platforms/livecd-light-root/post.inc.sh
... ... @@ -34,18 +34,12 @@
34 34 echo $timezone > $MOUNTDIR/etc/timezone
35 35 cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime
36 36  
37   -# prebuild postplug sound CARDID_DB (with some ugly trick to make it work from chroot)
38   -[ -e $MOUNTDIR/lib/modules/`uname -r` ] || ln -s ${KERNEL_MAJVER}${KERNEL_EXTRAVER} $MOUNTDIR/lib/modules/`uname -r`
39   -echo "SOUND_BUILD_CARDID_DB_ONLY=1 /etc/postplug/postplug.d/sound" >> $MOUNTDIR/tmp/sounddb.sh
40   -chroot $MOUNTDIR sh /tmp/sounddb.sh
41   -rm -f $MOUNTDIR/tmp/sounddb.sh
42   -[ -L $MOUNTDIR/lib/modules/`uname -r` ] && rm $MOUNTDIR/lib/modules/`uname -r`
43   -
44   -# remove unused initramfs generated by kernel
45   -rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}.img*
46   -
47   -# remove failsafe image to save space for livecd
48   -rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}-failsafe.img*
  37 +for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
  38 + # remove unused initramfs generated by kernel
  39 + rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${K}.img*
  40 + # remove failsafe image to save space for livecd
  41 + rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}-failsafe.img*
  42 +done
49 43  
50 44 # remove some documentation to save space on CD
51 45 for f in ChangeLog Changelog CHANGES TODO NEWS README README.txt; do
platforms/livecd-root/post.inc.sh
... ... @@ -46,18 +46,12 @@
46 46 chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f
47 47 done
48 48  
49   -# prebuild postplug sound CARDID_DB (with some ugly trick to make it work from chroot)
50   -[ -e $MOUNTDIR/lib/modules/`uname -r` ] || ln -s ${KERNEL_MAJVER}${KERNEL_EXTRAVER} $MOUNTDIR/lib/modules/`uname -r`
51   -echo "SOUND_BUILD_CARDID_DB_ONLY=1 /etc/postplug/postplug.d/sound" >> $MOUNTDIR/tmp/sounddb.sh
52   -chroot $MOUNTDIR sh /tmp/sounddb.sh
53   -rm -f $MOUNTDIR/tmp/sounddb.sh
54   -[ -L $MOUNTDIR/lib/modules/`uname -r` ] && rm $MOUNTDIR/lib/modules/`uname -r`
55   -
56   -# remove unused initramfs generated by kernel
57   -rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}.img*
58   -
59   -# remove failsafe image to save space for livecd
60   -rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}-failsafe.img*
  49 +for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
  50 + # remove unused initramfs generated by kernel
  51 + rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${K}.img*
  52 + # remove failsafe image to save space for livecd
  53 + rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}-failsafe.img*
  54 +done
61 55  
62 56 # remove some documentation to save space on CD
63 57 for f in ChangeLog Changelog CHANGES TODO NEWS README README.txt; do
platforms/livedvd-root/post.inc.sh
... ... @@ -47,16 +47,11 @@
47 47 chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f
48 48 done
49 49  
50   -# prebuild postplug sound CARDID_DB (with some ugly trick to make it work from chroot)
51 50 for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
52   - [ -e $MOUNTDIR/lib/modules/`uname -r` ] || ln -s ${KERNEL_MAJVER}${K} $MOUNTDIR/lib/modules/`uname -r`
53   - echo "SOUND_BUILD_CARDID_DB_ONLY=1 /etc/postplug/postplug.d/sound" >> $MOUNTDIR/tmp/sounddb.sh
54   - chroot $MOUNTDIR sh /tmp/sounddb.sh
55   - rm -f $MOUNTDIR/tmp/sounddb.sh
56   - [ -L $MOUNTDIR/lib/modules/`uname -r` ] && rm $MOUNTDIR/lib/modules/`uname -r`
57   -
58 51 # remove unused initramfs generated by kernel
59 52 rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${K}.img*
  53 +# # remove failsafe image to save space for livecd
  54 +# rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}-failsafe.img*
60 55 done
61 56  
62 57 prelink
platforms/sdk-root/Makefile
... ... @@ -19,7 +19,7 @@
19 19 $(MAKEDIST_TARGET)-sdk-root-en:
20 20 $(MAKEDIST_TARGET)-sdk-root-it:
21 21 $(MAKEDIST_TARGET)-sdk-root-es:
22   -$(MAKEDIST_TARGET)-sdk-root-i586: grub2
  22 +$(MAKEDIST_TARGET)-sdk-root-i586: grub
23 23 $(MAKEDIST_TARGET)-sdk-root-arm:
24 24 $(MAKEDIST_TARGET)-sdk-root-ppc: yaboot