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

Sync with changes in openmamba (devel) target

Browse Source
This commit is contained in:
Silvan Calarco 2011-11-20 16:19:57 +01:00
parent 3a60182c7e
commit 570d6b2f76
9 changed files with 32 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -16,7 +16,7 @@ $(MAKEDIST_TARGET)-commontools: sysvinit util-linux module-init-tools \
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 xinetd less \ dosfstools man mbr iptables cups vim iputils sudo postplug xinetd less \
reiserfsprogs reiser4progs ppp b43-tools mdadm usb-modeswitch \ reiserfsprogs reiser4progs ppp b43-tools mdadm usb-modeswitch \
ndiswrapper slmodem usbutils ftp telnet eject bluez \ ndiswrapper slmodem usbutils ftp telnet eject bluez lsof \
tcpdump pcmcia-utils xdg-utils unionfs_utils iproute $(MAKEDIST_TARGET)-firmwares \ tcpdump pcmcia-utils xdg-utils unionfs_utils iproute $(MAKEDIST_TARGET)-firmwares \
$(MAKEDIST_TARGET)-devel $(MAKEDIST_TARGET)-devel
$(MAKEDIST_TARGET)-debug: strace valgrind gdb minicom openssh-server dhcpclient rpm iputils \ $(MAKEDIST_TARGET)-debug: strace valgrind gdb minicom openssh-server dhcpclient rpm iputils \

8
Makefile.defs
View File

@ -99,6 +99,7 @@ libkorganizer_calendar.so.1 = korganizer
libkorganizer_eventviewer.so.1 = korganizer libkorganizer_eventviewer.so.1 = korganizer
libsmb4kdialogs.so = smb4k4 libsmb4kdialogs.so = smb4k4
perl[B] = perl
perl[bytes] = perl perl[bytes] = perl
perl[Automake__General] = automake perl[Automake__General] = automake
perl[Automake__Struct] = automake perl[Automake__Struct] = automake
@ -127,13 +128,20 @@ perl[Automake__XFile] = automake
libgs.so.9 = ghostscript libgs.so.9 = ghostscript
# ffmpeg / libav
libpostproc.so.51 = libpostproc-ffmpeg
libpostproc.so.51[LIBPOSTPROC_51] = libpostproc-ffmpeg
ffmpegpresets := ffmpeg-presets
# libreoffice # libreoffice
libreofficei18n = libreoffice-i18n-$(LANGUAGE) libreofficei18n = libreoffice-i18n-$(LANGUAGE)
# vpn # vpn
networkmanagervpnplugin = NetworkManager-vpnc NetworkManager-pptp networkmanagervpnplugin = NetworkManager-vpnc NetworkManager-pptp
knetworkmanagervpnplugin = plasma-applet-networkmanagement-vpnc plasma-applet-networkmanagement-pptp
packagekitgui = kpackagekit packagekitgui = kpackagekit
firewallgui = kcm_ufw
ifdef PLATFORM ifdef PLATFORM
include $(TARGETSDIR)/$(TARGET)/platforms/$(PLATFORM)/Makefile.defs include $(TARGETSDIR)/$(TARGET)/platforms/$(PLATFORM)/Makefile.defs

1
platforms/livecd-gnome-root/Makefile.defs
View File

@ -1 +1,2 @@
packagekitgui = gnome-packagekit packagekitgui = gnome-packagekit
firewallgui = gui-ufw

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

@ -45,18 +45,12 @@ esac
echo $timezone > $MOUNTDIR/etc/timezone echo $timezone > $MOUNTDIR/etc/timezone
cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime
# prebuild postplug sound CARDID_DB (with some ugly trick to make it work from chroot) for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
[ -e $MOUNTDIR/lib/modules/`uname -r` ] || ln -s ${KERNEL_MAJVER}${KERNEL_EXTRAVER} $MOUNTDIR/lib/modules/`uname -r` # remove unused initramfs generated by kernel
echo "SOUND_BUILD_CARDID_DB_ONLY=1 /etc/postplug/postplug.d/sound" >> $MOUNTDIR/tmp/sounddb.sh rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${K}.img*
chroot $MOUNTDIR sh /tmp/sounddb.sh # remove failsafe image to save space for livecd
rm -f $MOUNTDIR/tmp/sounddb.sh rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}-failsafe.img*
[ -L $MOUNTDIR/lib/modules/`uname -r` ] && rm $MOUNTDIR/lib/modules/`uname -r` done
# remove unused initramfs generated by kernel
rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}.img*
# remove failsafe image to save space for livecd
rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}-failsafe.img*
# install all GConf rules # install all GConf rules
cat > $MOUNTDIR/tmp/gconftool.sh << _EOF cat > $MOUNTDIR/tmp/gconftool.sh << _EOF

1
platforms/livecd-light-root/Makefile.defs
View File

@ -1 +1,2 @@
packagekitgui = gnome-packagekit packagekitgui = gnome-packagekit
firewallgui = gui-ufw

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

@ -34,18 +34,12 @@ esac
echo $timezone > $MOUNTDIR/etc/timezone echo $timezone > $MOUNTDIR/etc/timezone
cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime
# prebuild postplug sound CARDID_DB (with some ugly trick to make it work from chroot) for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
[ -e $MOUNTDIR/lib/modules/`uname -r` ] || ln -s ${KERNEL_MAJVER}${KERNEL_EXTRAVER} $MOUNTDIR/lib/modules/`uname -r` # remove unused initramfs generated by kernel
echo "SOUND_BUILD_CARDID_DB_ONLY=1 /etc/postplug/postplug.d/sound" >> $MOUNTDIR/tmp/sounddb.sh rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${K}.img*
chroot $MOUNTDIR sh /tmp/sounddb.sh # remove failsafe image to save space for livecd
rm -f $MOUNTDIR/tmp/sounddb.sh rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}-failsafe.img*
[ -L $MOUNTDIR/lib/modules/`uname -r` ] && rm $MOUNTDIR/lib/modules/`uname -r` done
# remove unused initramfs generated by kernel
rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}.img*
# remove failsafe image to save space for livecd
rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}-failsafe.img*
# remove some documentation to save space on CD # remove some documentation to save space on CD
for f in ChangeLog Changelog CHANGES TODO NEWS README README.txt; do for f in ChangeLog Changelog CHANGES TODO NEWS README README.txt; do

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

@ -46,18 +46,12 @@ for f in /usr/share/applications/chromium-devel.desktop /opt/kde/share/applicati
chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f
done done
# prebuild postplug sound CARDID_DB (with some ugly trick to make it work from chroot) for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
[ -e $MOUNTDIR/lib/modules/`uname -r` ] || ln -s ${KERNEL_MAJVER}${KERNEL_EXTRAVER} $MOUNTDIR/lib/modules/`uname -r` # remove unused initramfs generated by kernel
echo "SOUND_BUILD_CARDID_DB_ONLY=1 /etc/postplug/postplug.d/sound" >> $MOUNTDIR/tmp/sounddb.sh rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${K}.img*
chroot $MOUNTDIR sh /tmp/sounddb.sh # remove failsafe image to save space for livecd
rm -f $MOUNTDIR/tmp/sounddb.sh rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}-failsafe.img*
[ -L $MOUNTDIR/lib/modules/`uname -r` ] && rm $MOUNTDIR/lib/modules/`uname -r` done
# remove unused initramfs generated by kernel
rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}.img*
# remove failsafe image to save space for livecd
rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}-failsafe.img*
# remove some documentation to save space on CD # remove some documentation to save space on CD
for f in ChangeLog Changelog CHANGES TODO NEWS README README.txt; do for f in ChangeLog Changelog CHANGES TODO NEWS README README.txt; do

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

@ -47,16 +47,11 @@ for f in /usr/share/applications/chromium-devel.desktop \
chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f
done done
# prebuild postplug sound CARDID_DB (with some ugly trick to make it work from chroot)
for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
[ -e $MOUNTDIR/lib/modules/`uname -r` ] || ln -s ${KERNEL_MAJVER}${K} $MOUNTDIR/lib/modules/`uname -r`
echo "SOUND_BUILD_CARDID_DB_ONLY=1 /etc/postplug/postplug.d/sound" >> $MOUNTDIR/tmp/sounddb.sh
chroot $MOUNTDIR sh /tmp/sounddb.sh
rm -f $MOUNTDIR/tmp/sounddb.sh
[ -L $MOUNTDIR/lib/modules/`uname -r` ] && rm $MOUNTDIR/lib/modules/`uname -r`
# remove unused initramfs generated by kernel # remove unused initramfs generated by kernel
rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${K}.img* rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${K}.img*
# # remove failsafe image to save space for livecd
# rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}-failsafe.img*
done done
prelink prelink

2
platforms/sdk-root/Makefile
View File

@ -19,6 +19,6 @@ $(MAKEDIST_TARGET)-sdk-root-missing: wpa_supplicant dosfstools cups vim postplug
$(MAKEDIST_TARGET)-sdk-root-en: $(MAKEDIST_TARGET)-sdk-root-en:
$(MAKEDIST_TARGET)-sdk-root-it: $(MAKEDIST_TARGET)-sdk-root-it:
$(MAKEDIST_TARGET)-sdk-root-es: $(MAKEDIST_TARGET)-sdk-root-es:
$(MAKEDIST_TARGET)-sdk-root-i586: grub2 $(MAKEDIST_TARGET)-sdk-root-i586: grub
$(MAKEDIST_TARGET)-sdk-root-arm: $(MAKEDIST_TARGET)-sdk-root-arm:
$(MAKEDIST_TARGET)-sdk-root-ppc: yaboot $(MAKEDIST_TARGET)-sdk-root-ppc: yaboot