]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 29 Aug 2010 10:59:53 +0000 (12:59 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 29 Aug 2010 10:59:53 +0000 (12:59 +0200)
Conflicts:
config/rootfiles/core/40/filelists/files
make.sh

1  2 
config/rootfiles/common/initscripts
doc/packages-list.txt
lfs/initscripts
make.sh

index a43b7f031d4c12015110f3f25355205ea68c9fb9,87f4318d5fa2f144d3afb85838fe7f69f571bb1b..5fd0c17d964d28d49af21aa7c3f9295d5c634584
@@@ -28,12 -28,12 +28,13 @@@ etc/rc.d/init.d/dnsmas
  etc/rc.d/init.d/fcron
  #etc/rc.d/init.d/fetchmail
  etc/rc.d/init.d/firewall
 +etc/rc.d/init.d/firstsetup
  etc/rc.d/init.d/functions
  #etc/rc.d/init.d/gnump3d
  etc/rc.d/init.d/halt
  #etc/rc.d/init.d/hostapd
  #etc/rc.d/init.d/icecream
+ #etc/rc.d/init.d/imspector
  #etc/rc.d/init.d/ipfireseeder
  etc/rc.d/init.d/ipsec
  #etc/rc.d/init.d/lcd4linux
@@@ -179,7 -179,6 +180,7 @@@ etc/rc.d/rcsysinit.d/S45udev_retr
  etc/rc.d/rcsysinit.d/S50cleanfs
  etc/rc.d/rcsysinit.d/S60setclock
  etc/rc.d/rcsysinit.d/S70console
 +etc/rc.d/rcsysinit.d/S75firstsetup
  etc/rc.d/rcsysinit.d/S80localnet
  etc/rc.d/rcsysinit.d/S90sysctl
  #etc/sysconfig
diff --combined doc/packages-list.txt
index ef6b6355a2f622da1ba566c80f5740446ea74a23,c8dbc2e5edcbbe92b9c6a5be3246a2835499614d..ae670eafa667facfd8458aef996b0803e0c6d61b
@@@ -1,4 -1,4 +1,4 @@@
 -== List of softwares used to build IPFire Version: 2.7 ==
 +== List of softwares used to build IPFire Version: 2.8test ==
  * Archive-Tar-1.29
  * Archive-Zip-1.16
  * BerkeleyDB-0.27
@@@ -37,7 -37,7 +37,7 @@@
  * Unix-Syslog-0.100
  * XML-Parser-2.34
  * alsa-lib-1.0.23
 -* alsa-lib-1.0.23-kmod-2.6.32.15-ipfire
 +* alsa-lib-1.0.23-kmod-2.6.32.19-ipfire
  * amavisd-new-2.5.2
  * apcupsd-3.14.4
  * applejuice-0.31
@@@ -56,6 -56,7 +56,6 @@@
  * bluez-libs-3.36
  * br2684ctl
  * bridge-utils-1.1
 -* busybox-1.2.2
  * bwm-ng-0.6
  * bzip2-1.0.5
  * cacti-0.8.7e
  * clamav-0.96.2
  * cmake-2.4.8
  * collectd-4.9.1
 -* compat-wireless-2.6.35-1-kmod-2.6.32.15-ipfire
 -* compat-wireless-2.6.35-1-kmod-2.6.32.15-ipfire-xen
 +* compat-wireless-2.6.35-1-kmod-2.6.32.19-ipfire
 +* compat-wireless-2.6.35-1-kmod-2.6.32.19-ipfire-xen
  * coreutils-5.96
  * cpio-2.11
  * cpufrequtils-007
 -* cryptodev-20091126-kmod-2.6.32.15-ipfire
 -* cryptodev-20091126-kmod-2.6.32.15-ipfire-xen
 +* cryptodev-20091126-kmod-2.6.32.19-ipfire
 +* cryptodev-20091126-kmod-2.6.32.19-ipfire-xen
  * cups-1.4.2
  * curl-7.19.5
  * cyrus-imapd-2.2.12
  * cyrus-sasl-2.1.21
  * dahdi-2.2.1
 -* dahdi-2.2.1-kmod-2.6.32.15-ipfire
 -* dahdi-2.2.1-kmod-2.6.32.15-ipfire-xen
 +* dahdi-2.2.1-kmod-2.6.32.19-ipfire
 +* dahdi-2.2.1-kmod-2.6.32.19-ipfire-xen
  * db-4.4.20
  * dbus-1.0.3
  * ddrescue-1.12
  * diffutils-2.8.1
  * dnsmasq-2.45
  * dosfstools-3.0.9
 -* e1000-8.0.19-kmod-2.6.32.15-ipfire
 -* e1000-8.0.19-kmod-2.6.32.15-ipfire-xen
 -* e1000e-1.1.19-kmod-2.6.32.15-ipfire
 -* e1000e-1.1.19-kmod-2.6.32.15-ipfire-xen
 +* dracut-006
 +* e1000-8.0.19-kmod-2.6.32.19-ipfire
 +* e1000-8.0.19-kmod-2.6.32.19-ipfire-xen
 +* e1000e-1.1.19-kmod-2.6.32.19-ipfire
 +* e1000e-1.1.19-kmod-2.6.32.19-ipfire-xen
  * e2fsprogs-1.41.11
  * ebtables-v2.0.8-2
  * ed-0.2
  * icegenerator-0.5.5-pre2
  * iftop-0.17
  * igmpproxy-0.1
+ * imspector-0.9
  * inetutils-1.4.2
  * ipaddr-1.2
  * iperf-2.0.4
  * joe-3.7
  * jpegsrc.v6b
  * kbd-1.12
 -* klibc-1.5.14
 -* kqemu-1.4.0pre1-kmod-2.6.32.15-ipfire
 -* kqemu-1.4.0pre1-kmod-2.6.32.15-ipfire-xen
 +* kqemu-1.4.0pre1-kmod-2.6.32.19-ipfire
 +* kqemu-1.4.0pre1-kmod-2.6.32.19-ipfire-xen
  * kudzu-1.2.64
 -* kvm-kmod-2.6.33.1-kmod-2.6.32.15-ipfire
  * l7-protocols-2009-05-10
  * lame-3.97
  * lcd4linux-0.10.1-RC2
  * libwww-perl-5.803
  * libxml2-2.6.26
  * libxslt-1.1.17
 -* linux-2.6.32.15-ipfire
 -* linux-2.6.32.15-ipfire-xen
 +* linux-2.6.32.19-ipfire
 +* linux-2.6.32.19-ipfire-xen
  * linux-atm-2.4.1
  * linux-firmware-20100318
  * linux-libc-headers-2.6.12.0
  * lynis-1.2.9
  * lzo-2.02
  * m4-1.4.4
 -* mISDN-20100525-kmod-2.6.32.15-ipfire
 -* mISDN-20100525-kmod-2.6.32.15-ipfire-xen
 +* mISDN-20100525-kmod-2.6.32.19-ipfire
 +* mISDN-20100525-kmod-2.6.32.19-ipfire-xen
  * mISDNuser-20100525
 -* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.15-ipfire
 -* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.15-ipfire-xen
 +* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.19-ipfire
 +* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.19-ipfire-xen
  * make-3.81
  * man-db-2.4.3
  * man-pages-2.34
  * miau-0.6.5
  * minicom-2.4
  * misc-progs
 -* mkinitcpio-0.5.9
  * mktemp-1.5
  * mldonkey-3.0.0
  * module-init-tools-3.5
  * psmisc-22.2
  * qemu-0.11.1-kqemu
  * qemu-0.12.3
 -* r8101-1.016.00-kmod-2.6.32.15-ipfire
 -* r8101-1.016.00-kmod-2.6.32.15-ipfire-xen
 -* r8168-8.018.00-kmod-2.6.32.15-ipfire
 -* r8168-8.018.00-kmod-2.6.32.15-ipfire-xen
 -* r8169-6.013.00-kmod-2.6.32.15-ipfire
 -* r8169-6.013.00-kmod-2.6.32.15-ipfire-xen
 +* r8101-1.016.00-kmod-2.6.32.19-ipfire
 +* r8101-1.016.00-kmod-2.6.32.19-ipfire-xen
 +* r8168-8.018.00-kmod-2.6.32.19-ipfire
 +* r8168-8.018.00-kmod-2.6.32.19-ipfire-xen
 +* r8169-6.013.00-kmod-2.6.32.19-ipfire
 +* r8169-6.013.00-kmod-2.6.32.19-ipfire-xen
  * readline-5.1
  * reiser4progs-1.0.6
  * reiserfsprogs-3.6.21
  * squashfs-lzma-cvs20100214
  * squid-2.7.STABLE9
  * squidGuard-1.4.1
- * squidclamav-5.3
+ * squidclamav-5.4
  * sshfs-fuse-2.2
  * sslh-1.7a
  * streamripper-1.63.5
  * sudo-1.6.8p12
  * sysfsutils-1.3.0
  * sysklogd-1.5
 -* syslinux-3.62
 +* syslinux-3.86
  * sysstat-6.0.2
  * sysvinit-2.86
  * taglib-1.5
  * tar-1.22
 +* tcl8.4.13
  * tcp_wrappers_7.6
  * tcpdump-4.0.0
  * teamspeak-2.0.24.1
  * traceroute-2.0.12
  * tripwire-2.4.1.2
  * tunctl
 -* udev-096
 -* udev-096-klibc
 +* udev-125
  * unzip552
  * urlgrabber-3.1.0
 -* usb-modeswitch-1.1.2
 +* usb-modeswitch-1.1.3
 +* usb-modeswitch-data-20100707
  * usbutils-0.72
  * util-linux-2.12r
 -* v4l-dvb-b576509ea6d2-kmod-2.6.32.15-ipfire
 -* v4l-dvb-b576509ea6d2-kmod-2.6.32.15-ipfire-xen
 +* v4l-dvb-b576509ea6d2-kmod-2.6.32.19-ipfire
 +* v4l-dvb-b576509ea6d2-kmod-2.6.32.19-ipfire-xen
  * vdr-1.6.0
  * vdradmin-am-3.6.7
  * vim-7.0
diff --combined lfs/initscripts
index 1dbf65ded7a12031ebefec0fb7e2c827e9d4855a,ffb18c942f276fde3bf6355c6b2eeeeb8baf6bd9..7388d2fd5243fb7277f44ea82093159ecbb77a19
@@@ -146,6 -146,9 +146,9 @@@ $(TARGET) 
        ln -sf ../init.d/motion      /etc/rc.d/rc3.d/S99motion
        ln -sf ../init.d/motion      /etc/rc.d/rc0.d/K01motion
        ln -sf ../init.d/motion      /etc/rc.d/rc6.d/K01motion
+       ln -sf ../init.d/imspetor    /etc/rc.d/rc3.d/S99imspetor
+       ln -sf ../init.d/imspetor    /etc/rc.d/rc0.d/K01imspetor
+       ln -sf ../init.d/imspetor    /etc/rc.d/rc6.d/K01imspetor
        ln -sf  ../init.d/cyrus-sasl /etc/rc.d/rc0.d/K49cyrus-sasl
        ln -sf  ../init.d/cyrus-sasl /etc/rc.d/rc3.d/S24cyrus-sasl
        ln -sf  ../init.d/cyrus-sasl /etc/rc.d/rc6.d/K49cyrus-sasl
        ln -sf ../init.d/cleanfs     /etc/rc.d/rcsysinit.d/S50cleanfs
        ln -sf ../init.d/setclock    /etc/rc.d/rcsysinit.d/S60setclock
        ln -sf ../init.d/console     /etc/rc.d/rcsysinit.d/S70console
 +      ln -sf ../init.d/firstsetup  /etc/rc.d/rcsysinit.d/S75firstsetup
        ln -sf ../init.d/localnet    /etc/rc.d/rcsysinit.d/S80localnet
        ln -sf ../init.d/sysctl      /etc/rc.d/rcsysinit.d/S90sysctl
        
diff --combined make.sh
index 0b6e70e312e3c866b7941863b077c2e6d7f07fab,41ede31f412279373afddd51d5d07727df927abd..4d4529ff446af456bb6228f8c0bab5db791aa5df
+++ b/make.sh
@@@ -24,9 -24,9 +24,9 @@@
  
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
 -VERSION="2.7"                                                 # Version number
 +VERSION="2.8test"                                             # Version number
  CORE="40"                                                     # Core Level (Filename)
 -PAKFIRE_CORE="39"                                             # Core Level (PAKFIRE)
 +PAKFIRE_CORE="40"                                             # Core Level (PAKFIRE)
  GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`            # Git Branch
  SLOGAN="www.ipfire.org"                                               # Software slogan
  CONFIG_ROOT=/var/ipfire                                               # Configuration rootdir
@@@ -357,7 -357,7 +357,7 @@@ buildipfire() 
    ipfiremake e1000e                   XEN=1
    ipfiremake linux
    ipfiremake kqemu
 -  ipfiremake kvm-kmod
 +#  ipfiremake kvm-kmod
    ipfiremake v4l-dvb
    ipfiremake madwifi
    ipfiremake alsa                     KMOD=1
    ipfiremake pkg-config
    ipfiremake linux-atm
    ipfiremake cpio
 -  ipfiremake klibc
 -  ipfiremake mkinitcpio
 -  ipfiremake udev                     KLIBC=1
 +
 +  installmake strip
 +
 +  ipfiremake dracut
    ipfiremake expat
    ipfiremake gdbm
    ipfiremake gmp
    ipfiremake cdrtools
    ipfiremake dnsmasq
    ipfiremake dosfstools
 -  ipfiremake squashfstools
    ipfiremake reiserfsprogs
    ipfiremake xfsprogs
    ipfiremake sysfsutils
    ipfiremake asterisk
    ipfiremake lcr
    ipfiremake usb_modeswitch
 +  ipfiremake usb_modeswitch_data
    ipfiremake zerofree
    ipfiremake mdadm
    ipfiremake eject
    ipfiremake pound
    ipfiremake minicom
    ipfiremake ddrescue
 +  ipfiremake tcl
+   ipfiremake imspector
    echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
    cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
    echo >> $BASEDIR/build/var/ipfire/firebuild
@@@ -668,9 -667,34 +669,9 @@@ buildinstaller() 
    ipfiremake as86
    ipfiremake mbr
    ipfiremake memtest
 -  installmake linux-libc-header
 -  installmake binutils
 -  ipfiremake uClibc                   PASS=1
 -  ipfiremake gcc                      INST=1
 -  installmake uClibc                  PASS=2
 -  installmake gcc                     INST=2
 -  installmake uClibc                  PASS=3
 -  installmake busybox
 -  installmake udev
 -  installmake slang
 -  installmake newt
 -  installmake gettext
 -  installmake kbd
 -  installmake popt
 -  installmake sysvinit
 -  installmake misc-progs
 -  installmake reiserfsprogs
 -  installmake sysfsutils
 -  installmake util-linux
 -  installmake pciutils
 -  installmake zlib
 -  installmake mtd
 -  installmake wget
 -  installmake hwdata
 -  installmake kudzu
 -  installmake pcmciautils
 -  installmake installer
 -  installmake initrd
 +  ipfiremake installer
 +  installmake strip
 +  ipfiremake initrd
  }
  
  buildpackages() {
    export LOGFILE
    echo "... see detailed log in _build.*.log files" >> $LOGFILE
  
 -  installmake strip
    
    # Generating list of packages used
    echo -n "Generating packages list from logs" | tee -a $LOGFILE
@@@ -993,11 -1018,12 +994,12 @@@ uploadsrc
                beautify message FAIL
                exit 1
        fi
        URL_SOURCE=$(grep URL_SOURCE lfs/Config | awk '{ print $3 }')
-       REMOTE_FILES=$(echo "ls -1" | sftp -C ${IPFIRE_USER}@${URL_SOURCE})
+       REMOTE_FILES=$(echo "ls -1 --ignore=toolchains" | sftp -C ${IPFIRE_USER}@${URL_SOURCE})
  
        cd $BASEDIR/cache/
-       for file in $(ls -1); do
+       for file in $(ls -1 --ignore=toolchains); do
                grep -q "$file" <<<$REMOTE_FILES && continue
                NEW_FILES="$NEW_FILES $file"
        done