wok-next rev 4475
Merge
| author | Christophe Lincoln <pankso@slitaz.org> |
|---|---|
| date | Mon Nov 09 21:55:05 2009 +0100 (2009-11-09) |
| parents | 74dcbc43857b d3eca578f816 |
| children | 029b146d5377 |
| files |
line diff
1.1 --- a/busybox/stuff/init Sun Nov 08 23:33:00 2009 +0100 1.2 +++ b/busybox/stuff/init Mon Nov 09 21:55:05 2009 +0100 1.3 @@ -1,7 +1,52 @@ 1.4 #!/bin/sh 1.5 1.6 +mount_mapper() 1.7 +{ 1.8 + mount $root /mnt 1.9 + if [ -d /mnt/etc ]; then 1.10 + umount /sys 1.11 + for i in /dev/mapper $@ ; do 1.12 + cp -a $i /mnt$i 1.13 + done 1.14 + umount /proc 1.15 + echo -e "\\033[70G[ \\033[1;33mOK\\033[0;39m ]" 1.16 + exec /sbin/switch_root mnt /sbin/init 1.17 + fi 1.18 + echo -e "\\033[70G[ \\033[1;31mFailed\\033[0;39m ]" 1.19 +} 1.20 + 1.21 +mount -t proc proc /proc 1.22 +mount -t sysfs sysfs /sys 1.23 +if grep -q dmraid= /proc/cmdline; then 1.24 + root="$(sed 's/.*dmraid=\([^ ]*\).*/\1/' < /proc/cmdline)" 1.25 + echo -n "Switching / to dmraid $root..." 1.26 + case "$(dmraid -s | grep ^type | awk '{ print $3 }')" in 1.27 + mirror) modprobe dm-mirror;; 1.28 + raid[456]*) modprobe raid456;; 1.29 + esac 1.30 + name=$(dmraid -s | grep ^name | awk '{ print $3 }') 1.31 + case "$root" in 1.32 + /dev/*);; 1.33 + p*) root=/dev/mapper/${name}$root ;; 1.34 + *) root=/dev/mapper/${name}p$root ;; 1.35 + esac 1.36 + dmraid -ay 1.37 + mount_mapper 1.38 +elif grep -q softraid= /proc/cmdline; then 1.39 + root="$(sed 's/.*softraid=\([^ ]*\).*/\1/' < /proc/cmdline)" 1.40 + echo -n "Switching / to softraid $root..." 1.41 + mdadm --examine --scan --config=partitions > /etc/mdadm.conf 1.42 + grep level=raid /etc/mdadm.conf | while read line; do 1.43 + case "$line" in 1.44 + *=raid1\ *) modprobe dm-mirror ;; 1.45 + *=raid[456]\ *) modprobe raid456 ;; 1.46 + esac 1.47 + done 1.48 + mdadm --assemble --scan 1.49 + mount_mapper /etc/mdadm.conf 1.50 +fi 1.51 +umount /sys 1.52 echo -n "Switching / to tmpfs..." 1.53 -mount -t proc proc /proc 1.54 size="$(grep rootfssize= < /proc/cmdline | \ 1.55 sed 's/.*rootfssize=\([0-9]*[kmg%]\).*/-o size=\1/')" 1.56 free=$(busybox free | busybox awk '/Mem:/ { print int(($4*100)/$3) }')
2.1 --- a/linux-wireless/receipt Sun Nov 08 23:33:00 2009 +0100 2.2 +++ b/linux-wireless/receipt Mon Nov 09 21:55:05 2009 +0100 2.3 @@ -21,7 +21,7 @@ 2.4 export _pkg 2.5 2.6 $src/slitaz/list_modules.sh drivers/net/wireless drivers/staging/wlan-ng \ 2.7 - drivers/staging/rt2860 drivers/staging/rt2870 drivers/staging/echo drivers/leds net/wireless net/mac80211 | while read module; do 2.8 + drivers/staging/rt2860 drivers/staging/rt2870 drivers/staging/rt3070 drivers/staging/echo drivers/leds net/wireless net/mac80211 | while read module; do 2.9 dir=$path/$(dirname $module) 2.10 [ -d $fs/$dir ] || mkdir -p $fs/$dir 2.11 cp -a $_pkg/$path/$module $fs/$dir
3.1 --- a/linux/receipt Sun Nov 08 23:33:00 2009 +0100 3.2 +++ b/linux/receipt Mon Nov 09 21:55:05 2009 +0100 3.3 @@ -20,6 +20,7 @@ 3.4 git clone http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-standalone.git aufs2 3.5 cd aufs2 && git checkout origin/aufs2-30 3.6 cp -a Documentation fs include $src 3.7 + cp -a *.patch ../stuff 3.8 fi 3.9 cd $src 3.10 # SliTaz db 3.11 @@ -30,22 +31,23 @@ 3.12 # Misc patches from pascal 3.13 while read patch_file; do 3.14 echo "$patch_file" >> slitaz/patches 3.15 - cp ../stuff/$patch_file slitaz/$patch_file 3.16 + #cp ../stuff/$patch_file slitaz/$patch_file 3.17 + cp ../stuff/$patch_file slitaz 3.18 if [ -f done.$patch_file ]; then 3.19 echo "Skipping $patch_file" 3.20 continue 3.21 fi 3.22 echo "Apply $patch_file" 3.23 - patch -p1 < $patch_file || exit 1 3.24 + patch -p1 < slitaz/$patch_file || exit 1 3.25 touch done.$patch_file 3.26 done <<EOT 3.27 -../stuff/$PACKAGE-utf8-$VERSION.u 3.28 -../stuff/$PACKAGE-diff-$VERSION.u 3.29 -../stuff/$PACKAGE-freeinitrd-$VERSION.u 3.30 -../stuff/$PACKAGE-unlzma-$VERSION.u 3.31 -../aufs2/aufs2-base.patch 3.32 -../aufs2/aufs2-kbuild.patch 3.33 -../aufs2/aufs2-standalone.patch 3.34 +$PACKAGE-utf8-$VERSION.u 3.35 +$PACKAGE-diff-$VERSION.u 3.36 +$PACKAGE-freeinitrd-$VERSION.u 3.37 +$PACKAGE-unlzma-$VERSION.u 3.38 +aufs2-base.patch 3.39 +aufs2-kbuild.patch 3.40 +aufs2-standalone.patch 3.41 EOT 3.42 make mrproper 3.43 cp ../stuff/$PACKAGE-$VERSION-slitaz.config .config 3.44 @@ -93,6 +95,8 @@ 3.45 do 3.46 echo tazwok cook ${i%/receipt} 3.47 done 3.48 + # check and echo any module in kernel .config that's not added to one of linux-* pkgs 3.49 + ./stuff/check_modules.sh 3.50 } 3.51 3.52 # Pre and post install commands for Tazpkg.
4.1 --- a/linux/stuff/check_modules.sh Sun Nov 08 23:33:00 2009 +0100 4.2 +++ b/linux/stuff/check_modules.sh Mon Nov 09 21:55:05 2009 +0100 4.3 @@ -2,10 +2,11 @@ 4.4 # Echo any module in kernel .config that's not added to one of linux-* pkgs 4.5 # 2009/06/18 <jozee@slitaz.org> - GNU General Public License. 4.6 # 4.7 - 4.8 - VERSION=$1 4.9 - WOK=$2 4.10 - src=$WOK/linux/linux-$VERSION 4.11 + . /etc/tazwok.conf 4.12 + 4.13 + VERSION=`grep ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g'` 4.14 + src="$WOK/linux/linux-$VERSION" 4.15 + 4.16 cd $src 4.17 mkdir -p ../stuff/tmp 4.18 rm -f ../stuff/tmp/* # clean up 4.19 @@ -35,9 +36,11 @@ 4.20 done 4.21 if [ -f ../stuff/tmp/unpackaged-modules-"$VERSION".list ]; then 4.22 echo "======================================================================" 4.23 - echo " Some modules selected in .config were not categorized in linux-* pkgs" 4.24 - echo "Check linux/stuff/tmp/unpackaged-modules-$VERSION.list to see" 4.25 + echo " These modules selected in .config were not categorized in linux-* pkgs:" 4.26 cat ../stuff/tmp/unpackaged-modules-$VERSION.list 4.27 + #echo "Check linux/stuff/tmp/unpackaged-modules-$VERSION.list to see" 4.28 + echo "======================================================================" 4.29 else 4.30 rm -r ../stuff/tmp 4.31 fi 4.32 +
5.1 --- a/linux/stuff/linux-2.6.30.6-slitaz.config Sun Nov 08 23:33:00 2009 +0100 5.2 +++ b/linux/stuff/linux-2.6.30.6-slitaz.config Mon Nov 09 21:55:05 2009 +0100 5.3 @@ -1,7 +1,7 @@ 5.4 # 5.5 # Automatically generated make config: don't edit 5.6 # Linux kernel version: 2.6.30.6 5.7 -# Fri Sep 25 01:17:11 2009 5.8 +# Fri Nov 6 10:51:41 2009 5.9 # 5.10 # CONFIG_64BIT is not set 5.11 CONFIG_X86_32=y 5.12 @@ -343,11 +343,11 @@ 5.13 CONFIG_ACPI_PROCFS_POWER=y 5.14 CONFIG_ACPI_SYSFS_POWER=y 5.15 CONFIG_ACPI_PROC_EVENT=y 5.16 -CONFIG_ACPI_AC=m 5.17 -CONFIG_ACPI_BATTERY=m 5.18 +CONFIG_ACPI_AC=y 5.19 +CONFIG_ACPI_BATTERY=y 5.20 # CONFIG_ACPI_BUTTON is not set 5.21 CONFIG_ACPI_VIDEO=m 5.22 -# CONFIG_ACPI_FAN is not set 5.23 +CONFIG_ACPI_FAN=y 5.24 CONFIG_ACPI_DOCK=y 5.25 CONFIG_ACPI_PROCESSOR=y 5.26 CONFIG_ACPI_HOTPLUG_CPU=y 5.27 @@ -376,8 +376,8 @@ 5.28 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set 5.29 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y 5.30 CONFIG_CPU_FREQ_GOV_POWERSAVE=m 5.31 -CONFIG_CPU_FREQ_GOV_USERSPACE=m 5.32 -CONFIG_CPU_FREQ_GOV_ONDEMAND=m 5.33 +CONFIG_CPU_FREQ_GOV_USERSPACE=y 5.34 +CONFIG_CPU_FREQ_GOV_ONDEMAND=y 5.35 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m 5.36 5.37 # 5.38 @@ -939,7 +939,7 @@ 5.39 # CONFIG_PNPBIOS is not set 5.40 CONFIG_PNPACPI=y 5.41 CONFIG_BLK_DEV=y 5.42 -CONFIG_BLK_DEV_FD=y 5.43 +CONFIG_BLK_DEV_FD=m 5.44 # CONFIG_BLK_DEV_XD is not set 5.45 # CONFIG_PARIDE is not set 5.46 # CONFIG_BLK_CPQ_DA is not set 5.47 @@ -1272,7 +1272,7 @@ 5.48 # CONFIG_IEEE1394_ETH1394_ROM_ENTRY is not set 5.49 # CONFIG_IEEE1394_ETH1394 is not set 5.50 CONFIG_IEEE1394_RAWIO=m 5.51 -# CONFIG_IEEE1394_VIDEO1394 is not set 5.52 +CONFIG_IEEE1394_VIDEO1394=m 5.53 # CONFIG_IEEE1394_DV1394 is not set 5.54 # CONFIG_IEEE1394_VERBOSEDEBUG is not set 5.55 # CONFIG_I2O is not set 5.56 @@ -1378,7 +1378,7 @@ 5.57 CONFIG_ADAPTEC_STARFIRE=m 5.58 # CONFIG_AC3200 is not set 5.59 CONFIG_APRICOT=m 5.60 -CONFIG_B44=y 5.61 +CONFIG_B44=m 5.62 CONFIG_B44_PCI_AUTOSELECT=y 5.63 CONFIG_B44_PCICORE_AUTOSELECT=y 5.64 CONFIG_B44_PCI=y 5.65 @@ -1480,17 +1480,20 @@ 5.66 CONFIG_LIBIPW=m 5.67 # CONFIG_LIBIPW_DEBUG is not set 5.68 CONFIG_IWLWIFI=m 5.69 -# CONFIG_IWLWIFI_LEDS is not set 5.70 -# CONFIG_IWLWIFI_RFKILL is not set 5.71 +CONFIG_IWLWIFI_LEDS=y 5.72 +CONFIG_IWLWIFI_RFKILL=y 5.73 # CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT is not set 5.74 # CONFIG_IWLWIFI_DEBUG is not set 5.75 -# CONFIG_IWLAGN is not set 5.76 +CONFIG_IWLAGN=m 5.77 +CONFIG_IWL4965=y 5.78 +CONFIG_IWL5000=y 5.79 CONFIG_IWL3945=m 5.80 CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y 5.81 # CONFIG_HOSTAP is not set 5.82 CONFIG_B43=m 5.83 CONFIG_B43_PCI_AUTOSELECT=y 5.84 CONFIG_B43_PCICORE_AUTOSELECT=y 5.85 +# CONFIG_B43_PCMCIA is not set 5.86 CONFIG_B43_LEDS=y 5.87 # CONFIG_B43_DEBUG is not set 5.88 CONFIG_B43LEGACY=m 5.89 @@ -1674,7 +1677,7 @@ 5.90 CONFIG_MOUSE_PS2_TRACKPOINT=y 5.91 # CONFIG_MOUSE_PS2_ELANTECH is not set 5.92 # CONFIG_MOUSE_PS2_TOUCHKIT is not set 5.93 -CONFIG_MOUSE_SERIAL=y 5.94 +CONFIG_MOUSE_SERIAL=m 5.95 # CONFIG_MOUSE_APPLETOUCH is not set 5.96 # CONFIG_MOUSE_BCM5974 is not set 5.97 CONFIG_MOUSE_INPORT=m 5.98 @@ -2085,11 +2088,13 @@ 5.99 # 5.100 # Sonics Silicon Backplane 5.101 # 5.102 -CONFIG_SSB=y 5.103 +CONFIG_SSB=m 5.104 CONFIG_SSB_SPROM=y 5.105 CONFIG_SSB_PCIHOST_POSSIBLE=y 5.106 CONFIG_SSB_PCIHOST=y 5.107 CONFIG_SSB_B43_PCI_BRIDGE=y 5.108 +CONFIG_SSB_PCMCIAHOST_POSSIBLE=y 5.109 +# CONFIG_SSB_PCMCIAHOST is not set 5.110 # CONFIG_SSB_DEBUG is not set 5.111 CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y 5.112 CONFIG_SSB_DRIVER_PCICORE=y 5.113 @@ -2502,7 +2507,8 @@ 5.114 CONFIG_SND_HDA_CODEC_CMEDIA=y 5.115 CONFIG_SND_HDA_CODEC_SI3054=y 5.116 CONFIG_SND_HDA_GENERIC=y 5.117 -# CONFIG_SND_HDA_POWER_SAVE is not set 5.118 +CONFIG_SND_HDA_POWER_SAVE=y 5.119 +CONFIG_SND_HDA_POWER_SAVE_DEFAULT=5 5.120 CONFIG_SND_HDSP=m 5.121 CONFIG_SND_HDSPM=m 5.122 CONFIG_SND_HIFIER=m 5.123 @@ -2595,9 +2601,9 @@ 5.124 CONFIG_USB_DEVICEFS=y 5.125 CONFIG_USB_DEVICE_CLASS=y 5.126 # CONFIG_USB_DYNAMIC_MINORS is not set 5.127 -# CONFIG_USB_SUSPEND is not set 5.128 +CONFIG_USB_SUSPEND=y 5.129 # CONFIG_USB_OTG is not set 5.130 -# CONFIG_USB_MON is not set 5.131 +CONFIG_USB_MON=m 5.132 CONFIG_USB_WUSB=m 5.133 CONFIG_USB_WUSB_CBAF=m 5.134 # CONFIG_USB_WUSB_CBAF_DEBUG is not set 5.135 @@ -2613,7 +2619,6 @@ 5.136 # CONFIG_USB_ISP116X_HCD is not set 5.137 # CONFIG_USB_ISP1760_HCD is not set 5.138 CONFIG_USB_OHCI_HCD=y 5.139 -# CONFIG_USB_OHCI_HCD_SSB is not set 5.140 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set 5.141 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set 5.142 CONFIG_USB_OHCI_LITTLE_ENDIAN=y 5.143 @@ -2842,7 +2847,7 @@ 5.144 # CONFIG_OTUS is not set 5.145 CONFIG_RT2860=m 5.146 CONFIG_RT2870=m 5.147 -# CONFIG_RT3070 is not set 5.148 +CONFIG_RT3070=m 5.149 # CONFIG_COMEDI is not set 5.150 # CONFIG_ASUS_OLED is not set 5.151 # CONFIG_PANEL is not set 5.152 @@ -3017,8 +3022,8 @@ 5.153 # CONFIG_AUFS_SHWH is not set 5.154 # CONFIG_AUFS_BR_RAMFS is not set 5.155 # CONFIG_AUFS_BR_FUSE is not set 5.156 +CONFIG_AUFS_BDEV_LOOP=y 5.157 # CONFIG_AUFS_DEBUG is not set 5.158 -CONFIG_AUFS_BDEV_LOOP=y 5.159 # CONFIG_NILFS2_FS is not set 5.160 CONFIG_NETWORK_FILESYSTEMS=y 5.161 CONFIG_NFS_FS=y
6.1 --- a/linux/stuff/modules-2.6.30.6.list Sun Nov 08 23:33:00 2009 +0100 6.2 +++ b/linux/stuff/modules-2.6.30.6.list Mon Nov 09 21:55:05 2009 +0100 6.3 @@ -56,7 +56,9 @@ 6.4 drivers/net/phy/libphy.ko.gz 6.5 drivers/net/phy/lxt.ko.gz 6.6 drivers/net/phy/marvell.ko.gz 6.7 -drivers/net/phy/qsemi.ko.gz 6.8 +drivers/net/phy/qsemi.ko.gz 6.9 +drivers/net/phy/smsc.ko.gz 6.10 +drivers/net/dnet.ko.gz 6.11 drivers/net/sc92031.ko.gz 6.12 drivers/net/sis190.ko.gz 6.13 drivers/net/skge.ko.gz 6.14 @@ -78,9 +80,13 @@ 6.15 drivers/net/usb/rndis_host.ko.gz 6.16 drivers/net/usb/usbnet.ko.gz 6.17 drivers/net/usb/zaurus.ko.gz 6.18 +drivers/net/usb/cdc_eem.ko.gz 6.19 +drivers/net/usb/dm9601.ko.gz 6.20 drivers/net/via-velocity.ko.gz 6.21 drivers/net/wd.ko.gz 6.22 drivers/net/8390p.ko.gz 6.23 +drivers/net/b44.ko.gz 6.24 +drivers/net/r6040.ko.gz 6.25 drivers/ide/ide-cs.ko.gz 6.26 drivers/watchdog/softdog.ko.gz 6.27 drivers/parport/parport.ko.gz 6.28 @@ -97,7 +103,12 @@ 6.29 drivers/usb/serial/ch341.ko.gz 6.30 drivers/usb/serial/pl2303.ko.gz 6.31 drivers/usb/serial/usbserial.ko.gz 6.32 +drivers/usb/mon/usbmon.ko.gz 6.33 +drivers/ssb/ssb.ko.gz 6.34 +drivers/block/floppy.ko.gz 6.35 +drivers/input/mouse/sermouse.ko.gz 6.36 fs/binfmt_misc.ko.gz 6.37 +fs/fat/msdos.ko.gz 6.38 net/ipv4/netfilter/ipt_REJECT.ko.gz 6.39 net/netfilter/nfnetlink.ko.gz 6.40 net/netfilter/nfnetlink_log.ko.gz
7.1 --- a/mirror-tools/stuff/usr/bin/mkpkgiso Sun Nov 08 23:33:00 2009 +0100 7.2 +++ b/mirror-tools/stuff/usr/bin/mkpkgiso Mon Nov 09 21:55:05 2009 +0100 7.3 @@ -5,19 +5,23 @@ 7.4 # Authors : Eric Joseph-Alexandre <erjo@slitaz.org> 7.5 # Pascal Bellard <pascal.bellard@slitaz.org> 7.6 7.7 -VERSION=0.6 7.8 +VERSION=0.7 7.9 7.10 +PKG_VER=$1 7.11 ROOT=/home/slitaz/iso 7.12 +REPOS=/var/www/slitaz/mirror/packages/$PKG_VER 7.13 +IFMEM_C32=/var/www/slitaz/mirror/pxe/ifmem.c32 7.14 +ISO_DIR=/var/www/slitaz/mirror/iso/$PKG_VER 7.15 + 7.16 +[ -s /etc/slitaz/mkpkgiso.conf ] && . /etc/slitaz/mkpkgiso.conf 7.17 +[ -s ./mkpkgiso.conf ] && . ./mkpkgiso.conf 7.18 + 7.19 SORT_DIR=${ROOT}/_iso.$$ 7.20 TEMP_DIR=${ROOT}/_iso.$$ 7.21 SORT_FILE=${ROOT}/_sort.$$ 7.22 -PKG_VER=$1 7.23 shift 7.24 OPTIONS=$@ 7.25 PKG_DIR=$TEMP_DIR/packages/$PKG_VER 7.26 -REPOS=/var/www/slitaz/mirror/packages/$PKG_VER 7.27 -PXE_DIR=/var/www/slitaz/mirror/pxe 7.28 -ISO_DIR=/var/www/slitaz/mirror/iso/$PKG_VER 7.29 LOG=$PWD/$(basename $0).log 7.30 7.31 # 7.32 @@ -32,6 +36,8 @@ 7.33 Usage: $(basename $0) <Version> 7.34 [--boot [--auto-install] [--loram-detect]]|--webboot] [--filter] 7.35 [--wok] [--wok-stable] [--website][--dry-run] 7.36 +Example: 7.37 +$(basename $0) cooking --boot --auto-install --loram-detect --filter --wok --website 7.38 EOT 7.39 exit 1 7.40 fi 7.41 @@ -45,18 +51,33 @@ 7.42 # Status function. 7.43 status() 7.44 { 7.45 - local CHECK=$? 7.46 - echo -en "\\033[70G[ " 7.47 - if [ $CHECK = 0 ]; then 7.48 - echo -en "\\033[1;33mOK" 7.49 - else 7.50 - echo -en "\\033[1;31mFailed" 7.51 - fi 7.52 - echo -e "\\033[0;39m ]" 7.53 + local CHECK=$? 7.54 + echo -en "\\033[70G[ " 7.55 + if [ $CHECK = 0 ]; then 7.56 + echo -en "\\033[1;33mOK" 7.57 + else 7.58 + echo -en "\\033[1;31mFailed" 7.59 + fi 7.60 + echo -e "\\033[0;39m ]" 7.61 +} 7.62 + 7.63 +need() 7.64 +{ 7.65 + found=1 7.66 + for i in $@ ; do 7.67 + [ -s $i ] && continue 7.68 + echo "Missing: $i " 7.69 + found=0 7.70 + done 7.71 + [ $found -ne 0 ] && return 7.72 + status 7.73 + rm -rf $TEMP_DIR $SORT_FILE 7.74 + exit 1 7.75 } 7.76 7.77 # Create temp directory 7.78 mkdir -p $TEMP_DIR/packages/$PKG_VER 7.79 +which genisoimage > /dev/null || need /usr/bin/genisoimage 7.80 7.81 # Prepare evrything for ISO 7.82 7.83 @@ -176,12 +197,9 @@ 7.84 # Copy hg subtree 7.85 get_from_hg() 7.86 { 7.87 -[ /slitaz/home/slitaz/hg/$1 ] || return 7.88 echo -n "Adding $2" 7.89 -/usr/sbin/chroot /slitaz hg --repository /home/slitaz/hg/$1 pull >/dev/null 7.90 -/usr/sbin/chroot /slitaz hg --repository /home/slitaz/hg/$1 update >/dev/null 7.91 -mkdir $TEMP_DIR/$1 7.92 -cp -a /slitaz/home/slitaz/hg/$1/* $TEMP_DIR/$1 7.93 +wget -q -O - http://hg.slitaz.org/$1/archive/tip.tar.bz2 | tar xjf - -C $TEMP_DIR 7.94 +mv $TEMP_DIR/$1-* $TEMP_DIR/$1 7.95 status 7.96 echo "$(du -hs $TEMP_DIR/$1 | awk '{ print $1 }') used by $2." 7.97 } 7.98 @@ -210,8 +228,6 @@ 7.99 --website) 7.100 if get_from_hg website "web site"; then 7.101 echo "$SORT_DIR/website -6000" >> $SORT_FILE 7.102 - echo "$(echo $SORT_DIR/packages/*/lighttpd-[0-9]*) -7100" >> $SORT_FILE 7.103 - echo "$(echo $SORT_DIR/packages/*/pcre-[0-9]*) -7100" >> $SORT_FILE 7.104 cat >>$TEMP_DIR/install.sh<<EOF 7.105 echo "=> slitaz web site installed in file://\$DIR/website/index.html" 7.106 EOF 7.107 @@ -238,7 +254,9 @@ 7.108 isoloram=$ISO_DIR/flavors/slitaz-loram-cdrom-sqfs.iso 7.109 case " $OPTIONS " in 7.110 *\ --boot\ *) 7.111 - echo -n "Creating boot tree" 7.112 + echo -n "Creating boot tree" 7.113 + need $iso 7.114 + which isoinfo > /dev/null || need /usr/bin/isoinfo 7.115 isoinfo -R -l -i $iso | awk '/^Directory/ { path=$4 } /^-/ { print path$12 }' | while read file; do 7.116 [ "$(basename $file)" == ".." ] && continue 7.117 [ "$file" = "/boot/isolinux/boot.cat" ] && continue 7.118 @@ -249,22 +267,24 @@ 7.119 if [ -f "$(echo $TEMP_DIR/boot/vmlinuz*)" ]; then 7.120 rm -f $TEMP_DIR/boot/bzImage 7.121 ln $TEMP_DIR/boot/vmlinuz* $TEMP_DIR/boot/bzImage 7.122 - fi 7.123 + fi 7.124 status 7.125 BOOT_OPT="-sort $SORT_FILE -b boot/isolinux/isolinux.bin \ 7.126 -c boot/isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table" 7.127 - case " $OPTIONS " in 7.128 + case " $OPTIONS " in 7.129 *\ --auto-install\ *) 7.130 - echo -n "Enable auto install" 7.131 + echo -n "Enable auto install" 7.132 sed -i "s/rw root/rw config=LABEL=packages-$PKG_VER,install.sh root/" \ 7.133 $TEMP_DIR/boot/isolinux/*.cfg 7.134 status 7.135 ;; 7.136 esac 7.137 - [ -f $PXE_DIR/ifmem.c32 -a -f $isoloram ] && case " $OPTIONS " in 7.138 + case " $OPTIONS " in 7.139 *\ --loram-detect\ *) 7.140 - echo -n "Enable loram autodetection" 7.141 - cp $PXE_DIR/ifmem.c32 "$TEMP_DIR/boot/isolinux" 7.142 + echo -n "Enable loram autodetection" 7.143 + need $IFMEM_C32 $isoloram 7.144 + which isoinfo > /dev/null || need /usr/bin/isoinfo 7.145 + cp $IFMEM_C32 "$TEMP_DIR/boot/isolinux" 7.146 isoinfo -R -x "/usr.sqfs" -i $isoloram > "$TEMP_DIR/usr.sqfs" 7.147 echo "$SORT_DIR/usr.sqfs -5000" >> $SORT_FILE 7.148 isoinfo -R -x "/boot/rootfs.gz" -i $isoloram > \ 7.149 @@ -300,18 +320,19 @@ 7.150 ;; 7.151 *\ --webboot\ *) 7.152 if extract_boot gpxe; then 7.153 - echo -n "Creating web boot tree" 7.154 - mkdir $TEMP_DIR/boot/isolinux/ 7.155 - isoinfo -x "/BOOT/ISOLINUX/ISOLINUX.BIN;1" -i $iso > \ 7.156 - $TEMP_DIR/boot/isolinux/isolinux.bin 7.157 - mv $TEMP_DIR/boot/gpxe $TEMP_DIR/boot/isolinux 7.158 - echo "$SORT_DIR/boot 0" >> $SORT_FILE 7.159 - cat > $TEMP_DIR/boot/isolinux/isolinux.cfg <<EOT 7.160 + echo -n "Creating web boot tree" 7.161 + which isoinfo > /dev/null || need /usr/bin/isoinfo 7.162 + mkdir $TEMP_DIR/boot/isolinux/ 7.163 + isoinfo -R -x "/boot/isolinux/isolinux.bin" -i $iso > \ 7.164 + $TEMP_DIR/boot/isolinux/isolinux.bin 7.165 + mv $TEMP_DIR/boot/gpxe $TEMP_DIR/boot/isolinux 7.166 + echo "$SORT_DIR/boot 0" >> $SORT_FILE 7.167 + cat > $TEMP_DIR/boot/isolinux/isolinux.cfg <<EOT 7.168 default gpxe 7.169 append http://mirror.slitaz.org/pxe/pxelinux.0 7.170 EOT 7.171 - status 7.172 - BOOT_OPT="-sort $SORT_FILE -b boot/isolinux/isolinux.bin \ 7.173 + status 7.174 + BOOT_OPT="-sort $SORT_FILE -b boot/isolinux/isolinux.bin \ 7.175 -c boot/isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table" 7.176 fi 7.177 ;; 7.178 @@ -319,7 +340,7 @@ 7.179 7.180 if [ -n "$BOOT_OPT" ]; then 7.181 echo "$(du -chs $TEMP_DIR/boot $TEMP_DIR/usr.sqfs 2> /dev/null | \ 7.182 - tail -1 | awk '{ print $1 }') used by boot." 7.183 + awk 'END { print $1 }') used by boot." 7.184 fi 7.185 7.186 case " $OPTIONS " in 7.187 @@ -330,7 +351,7 @@ 7.188 esac 7.189 # Gen ISO 7.190 echo -n "Generating iso image" 7.191 -/usr/bin/genisoimage -R -J -f -V $VOLUME_ID \ 7.192 +genisoimage -R -J -f -V $VOLUME_ID \ 7.193 -P "$PUBLISHER" -md5-list $REPOS/packages.md5 \ 7.194 -quiet -o $OUTPUT $BOOT_OPT $TEMP_DIR 7.195 status 7.196 @@ -339,11 +360,11 @@ 7.197 7.198 cd ${ROOT} 7.199 echo -n "Create hybrid DVD/CDROM" 7.200 -[ -x /usr/bin/isohybrid ] && /usr/bin/isohybrid $IMAGE 2> /dev/null 7.201 +which isohybrid > /dev/null && isohybrid $IMAGE 2> /dev/null 7.202 status 7.203 7.204 echo -n "Calculate md5sum" 7.205 -/usr/bin/md5sum $IMAGE > $(basename $IMAGE .iso).md5 7.206 +md5sum $IMAGE > $(basename $IMAGE .iso).md5 7.207 status 7.208 7.209 echo -n "Moving file to mirror"
8.1 --- a/mplayer-svn/receipt Sun Nov 08 23:33:00 2009 +0100 8.2 +++ b/mplayer-svn/receipt Mon Nov 09 21:55:05 2009 +0100 8.3 @@ -1,7 +1,7 @@ 8.4 # SliTaz package receipt. 8.5 8.6 PACKAGE="mplayer-svn" 8.7 -VERSION="29268" 8.8 +VERSION="29843" 8.9 CATEGORY="multimedia" 8.10 SHORT_DESC="Mplayer SVN version" 8.11 MAINTAINER="pankso@slitaz.org" 8.12 @@ -16,7 +16,7 @@ 8.13 # This package is compiled against shared ffmpeg. Compiling with shared ffmpeg on svn version is always challenging. 8.14 # Tip: Try to use the same day ffmpeg and mplayer versions (use: svn info), very likely to succeed 8.15 # To compile with in-built ffmpeg (and double the size of pkg), remove from compile options: 8.16 -# --disable-libavcodec_a --disable-libavformat_a --disable-libpostproc_a --disable-libswscale_a 8.17 +# --disable-libavutil_a --disable-libavcodec_a --disable-libavformat_a --disable-libpostproc_a --disable-libswscale_a 8.18 8.19 compile_rules() 8.20 { 8.21 @@ -53,14 +53,14 @@ 8.22 --disable-jack \ 8.23 --disable-liblzo \ 8.24 --disable-libdv \ 8.25 - --disable-libavcodec_a \ 8.26 - --disable-libavformat_a \ 8.27 - --disable-libpostproc_a \ 8.28 - --disable-libswscale_a \ 8.29 - --disable-fribidi --target=i386-linux --disable-libavutil_a \ 8.30 + --disable-speex \ 8.31 + --disable-openal \ 8.32 + --disable-faad \ 8.33 + --disable-libavcodec_mpegaudio_hp \ 8.34 + --disable-fribidi --target=i386-linux \ 8.35 --disable-tv --disable-tv-teletext --disable-radio-v4l2 --disable-v4l2 \ 8.36 --disable-musepack --disable-dvdnav --disable-esd --disable-mga \ 8.37 - --disable-libamr_nb --disable-lirc --disable-nas --disable-vdpau \ 8.38 + --disable-lirc --disable-lircc --disable-smb --disable-nemesi --disable-nas --disable-vdpau \ 8.39 --enable-gui --enable-freetype && 8.40 make && 8.41 make DESTDIR=$PWD/../_pkg install
9.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 9.2 +++ b/mplayer-svn/stuff/mplayer-svn-29843-liba52-gcc44.u Mon Nov 09 21:55:05 2009 +0100 9.3 @@ -0,0 +1,12 @@ 9.4 +--- configure 2009-04-16 12:02:10.000000000 +0200 9.5 ++++ configure 2009-05-22 15:23:38.000000000 +0200 9.6 +@@ -6501,6 +6501,7 @@ 9.7 + def_liba52='#undef CONFIG_LIBA52' 9.8 + def_liba52_internal="#undef CONFIG_LIBA52_INTERNAL" 9.9 + if test "$_liba52_internal" = yes ; then 9.10 ++ test "$cc_vendor" = gnu && test "$cc_version" = 4.4.0 && CFLAGS=$(echo $CFLAGS|sed "s/ *-O4 */ -O2 /") 9.11 + _liba52=yes 9.12 + def_liba52_internal="#define CONFIG_LIBA52_INTERNAL 1" 9.13 + _res_comment="internal" 9.14 + 9.15 +
10.1 --- a/poppler/receipt Sun Nov 08 23:33:00 2009 +0100 10.2 +++ b/poppler/receipt Mon Nov 09 21:55:05 2009 +0100 10.3 @@ -5,9 +5,9 @@ 10.4 CATEGORY="office" 10.5 SHORT_DESC="Poppler is a PDF rendering library." 10.6 MAINTAINER="pankso@slitaz.org" 10.7 -DEPENDS="expat freetype glib jpeg libxml2 xorg-libXdamage" 10.8 +DEPENDS="expat freetype glib jpeg libxml2 xorg-libXdamage lcms" 10.9 BUILD_DEPENDS="$DEPENDS expat-dev pkg-config jpeg-dev libxml2-dev \ 10.10 -freetype-dev fontconfig-dev glib-dev Qt4-dev" 10.11 +freetype-dev fontconfig-dev glib-dev Qt4-dev lcms-dev" 10.12 TARBALL="$PACKAGE-$VERSION.tar.gz" 10.13 WEB_SITE="http://poppler.freedesktop.org/" 10.14 WGET_URL="http://poppler.freedesktop.org/$TARBALL"
11.1 --- a/pygtk/receipt Sun Nov 08 23:33:00 2009 +0100 11.2 +++ b/pygtk/receipt Mon Nov 09 21:55:05 2009 +0100 11.3 @@ -7,7 +7,8 @@ 11.4 MAINTAINER="erjo@slitaz.org" 11.5 DEPENDS="python pycairo pygobject expat gtk+ libglade libxml2 xorg-libX11 \ 11.6 xorg-libXau xorg-libXcomposite xorg-libXcursor xorg-libXdmcp xorg-libXext \ 11.7 -xorg-libXfixes xorg-libXinerama xorg-libXrandr xorg-libXrender xorg-libXdamage" 11.8 +xorg-libXfixes xorg-libXinerama xorg-libXrandr xorg-libXrender \ 11.9 +xorg-libXdamage libffi" 11.10 BUILD_DEPENDS="pygobject-dev pycairo-dev libglade-dev" 11.11 TARBALL="$PACKAGE-$VERSION.tar.bz2" 11.12 WEB_SITE="http://www.pygtk.org/"
12.1 --- a/slitaz-mercurial-style/stuff/templates/slitaz/index.tmpl Sun Nov 08 23:33:00 2009 +0100 12.2 +++ b/slitaz-mercurial-style/stuff/templates/slitaz/index.tmpl Mon Nov 09 21:55:05 2009 +0100 12.3 @@ -18,7 +18,7 @@ 12.4 <div class="nav_box"> 12.5 <h4>About SliTaz repos</h4> 12.6 <p> 12.7 -This web interface let you follow in real time all improvments, fixes 12.8 +This web interface lets you follow in real time all improvements, fixes 12.9 and other changes made by SliTaz contributors. 12.10 </p> 12.11 </div>
13.1 --- a/smplayer/receipt Sun Nov 08 23:33:00 2009 +0100 13.2 +++ b/smplayer/receipt Mon Nov 09 21:55:05 2009 +0100 13.3 @@ -1,7 +1,7 @@ 13.4 # SliTaz package receipt. 13.5 13.6 PACKAGE="smplayer" 13.7 -VERSION="0.6.7" 13.8 +VERSION="0.6.8" 13.9 CATEGORY="multimedia" 13.10 SHORT_DESC="QT-based front-end for MPlayer" 13.11 MAINTAINER="jozee@slitaz.org"