]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
Merge branch 'next'
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 5 Sep 2009 10:38:32 +0000 (12:38 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 5 Sep 2009 10:38:32 +0000 (12:38 +0200)
1  2 
config/rootfiles/oldcore/30/filelists/files
config/rootfiles/oldcore/30/update.sh
doc/packages-list.txt
make.sh

index 164b33fce4efcac0e504f28f219ca808bbdd48c4,917733ff955dd8ffc3ed2e87f4586937999a4f35..164b33fce4efcac0e504f28f219ca808bbdd48c4
@@@ -1,4 -1,3 +1,4 @@@
 +etc/system-release
  lib/modules/2.6.27.25-ipfire/kernel/drivers/net/e1000e/e1000e.ko
  lib/modules/2.6.27.25-ipfire/kernel/drivers/net/usb/hso.ko
  lib/modules/2.6.27.25-ipfire/kernel/drivers/usb/serial/option.ko
@@@ -14,6 -13,3 +14,6 @@@ srv/web/ipfire/html/themes/maniac/inclu
  opt/pakfire/pakfire
  usr/bin/curl
  etc/ppp/ip-up
 +usr/sbin/grub-install
 +lib/initcpio/install/virtio
 +etc/mkinitcpio.conf
index 9029b14230b95e9056fee09e80cbefc68ee89bb1,c7eebf948c2d986a78e072bf600c555c548ac437..9029b14230b95e9056fee09e80cbefc68ee89bb1
@@@ -67,4 -67,3 +67,4 @@@ f
  if [ ! -s "/opt/pakfire/db/uuid" ]; then
        rm -f /opt/pakfire/db/uuid
  fi
 +cp /etc/mkinitcpio.conf /etc/mkinitcpio.conf.org
diff --combined doc/packages-list.txt
index 030897c91995e4d22cec1caef2ebe2a004998b02,fc383fe59d88254c724b383075eee1c5f709191d..fab524669ee5c6d55d8f9254f3039f7cec49abff
  * Unix-Syslog-0.100
  * XML-Parser-2.34
  * alsa-lib-1.0.19
- * alsa-lib-1.0.19-kmod-2.6.27.25-ipfire
+ * alsa-lib-1.0.19-kmod-2.6.27.31-ipfire
  * amavisd-new-2.5.2
  * apcupsd-3.14.4
  * applejuice-0.31
  * arping-2.05
  * as86-0.16.17
  * asterisk-1.4.18
- * atl2-2.0.5-kmod-2.6.27.25-ipfire
- * atl2-2.0.5-kmod-2.6.27.25-ipfire-xen
+ * atl2-2.0.5-kmod-2.6.27.31-ipfire
  * autoconf-2.59
  * automake-1.9.6
  * backup-ipfire
@@@ -60,7 -59,7 +59,7 @@@
  * busybox-1.2.2
  * bwm-ng-0.6
  * bzip2-1.0.5
 -* cacti-0.8.7d
 +* cacti-0.8.7e
  * calamaris-2.59
  * capi4k-utils-2005-07-18
  * ccache-2.4
@@@ -69,8 -68,7 +68,7 @@@
  * clamav-0.95.2
  * cmake-2.4.8
  * collectd-4.5.3
- * compat-wireless-2009-06-30-kmod-2.6.27.25-ipfire
- * compat-wireless-2009-06-30-kmod-2.6.27.25-ipfire-xen
+ * compat-wireless-2.6.31-rc7-kmod-2.6.27.31-ipfire
  * coreutils-5.96
  * cpio-2.6
  * cpufrequtils-005
@@@ -85,8 -83,7 +83,7 @@@
  * diffutils-2.8.1
  * dnsmasq-2.47
  * dosfstools-2.11
- * e1000e-1.0.2.5-kmod-2.6.27.25-ipfire
- * e1000e-1.0.2.5-kmod-2.6.27.25-ipfire-xen
+ * e1000e-1.0.2.5-kmod-2.6.27.31-ipfire
  * e2fsprogs-1.39
  * ebtables-v2.0.8-2
  * ed-0.2
  * hdparm-8.9
  * hostapd-0.6.9
  * hplip-2.7.10
- * hso-1.9-kmod-2.6.27.25-ipfire
- * hso-1.9-kmod-2.6.27.25-ipfire-xen
+ * hso-1.9-kmod-2.6.27.31-ipfire
  * htop-0.8.1
  * httpd-2.2.11
  * hwdata
  * iputils-ss020927
  * iw-0.9.15
  * java-1.6.0_12-for-ipfire
 +* joe-3.7
  * jpegsrc.v6b
  * kbd-1.12
  * klibc-1.5.14
- * kqemu-1.4.0pre1-kmod-2.6.27.25-ipfire
- * kqemu-1.4.0pre1-kmod-2.6.27.25-ipfire-xen
+ * kqemu-1.4.0pre1-kmod-2.6.27.31-ipfire
  * kudzu-1.2.64
  * l7-protocols-2009-05-10
  * lame-3.97
  * libwww-perl-5.803
  * libxml2-2.6.26
  * libxslt-1.1.17
- * linux-2.6.27.25-ipfire
- * linux-2.6.27.25-ipfire-xen
+ * linux-2.6.27.31-ipfire
  * linux-atm-2.4.1
  * linux-libc-headers-2.6.12.0
  * lm_sensors-3.0.3
  * lynis-1.2.6
  * lzo-2.02
  * m4-1.4.4
- * mISDN.git-9bf7deaa4b8829ab8fbccb34529a17aab2ddea93-kmod-2.6.27.25-ipfire
- * mISDN.git-9bf7deaa4b8829ab8fbccb34529a17aab2ddea93-kmod-2.6.27.25-ipfire-xen
+ * mISDN.git-9bf7deaa4b8829ab8fbccb34529a17aab2ddea93-kmod-2.6.27.31-ipfire
  * mISDNuser.git-54928dec57bc846f2c2186f3640e69a053cd3641
- * madwifi-hal-0.10.5.6-r4031-20090529-kmod-2.6.27.25-ipfire
- * madwifi-hal-0.10.5.6-r4031-20090529-kmod-2.6.27.25-ipfire-xen
+ * madwifi-hal-0.10.5.6-r4031-20090529-kmod-2.6.27.31-ipfire
  * make-3.81
  * man-db-2.4.3
  * man-pages-2.34
  * openssh-5.2p1
  * openssl-0.9.8k
  * openswan-2.6.21
- * openswan-2.6.21-kmod-2.6.27.25-ipfire
- * openswan-2.6.21-kmod-2.6.27.25-ipfire-xen
- * openvpn-2.0.9
+ * openswan-2.6.21-kmod-2.6.27.31-ipfire
+ * openvpn-2.1_rc19
  * p7zip_4.65
  * pam_mysql-0.7RC1
  * patch-2.5.4
  * setuptools-0.6c8
  * shadow-4.0.15
  * slang-1.4.9
- * smartmontools-5.36
+ * smartmontools-5.39-svn_r2877
  * snort-2.8.4
  * sox-12.18.1
  * spandsp-0.0.4pre15
  * urlgrabber-3.1.0
  * usbutils-0.72
  * util-linux-2.12r
- * v4l-dvb-bff77ec33116-kmod-2.6.27.25-ipfire
- * v4l-dvb-bff77ec33116-kmod-2.6.27.25-ipfire-xen
+ * v4l-dvb-bff77ec33116-kmod-2.6.27.31-ipfire
  * vdr-1.6.0
  * vdradmin-am-3.6.4
  * vim-7.0
diff --combined make.sh
index 512aba76c4d3bba10f093f7abfae15650197be45,7f68f293d461440e3dd4dcaea65f728f738c8080..cf085774c55e679fe06ae8284026d2cf0f853f34
+++ b/make.sh
@@@ -25,7 -25,7 +25,7 @@@
  NAME="IPFire"                                                                         # Software name
  SNAME="ipfire"                                                                        # Short name
  VERSION="2.5"
- CORE="30"
+ CORE="31"
  GIT_BRANCH=master:master                                                                              # Version number
  SLOGAN="www.ipfire.org"                                       # Software slogan
  CONFIG_ROOT=/var/ipfire                                       # Configuration rootdir
@@@ -338,17 -338,17 +338,17 @@@ buildipfire() 
    ipfiremake pptp
    ipfiremake unzip
    ipfiremake which
  ipfiremake linux                    XEN=1
  ipfiremake atl2                     XEN=1
  ipfiremake hso                      XEN=1
  ipfiremake e1000e                   XEN=1
  ipfiremake kqemu                    XEN=1
  ipfiremake v4l-dvb                  XEN=1
  ipfiremake madwifi                  XEN=1
- #  ipfiremake alsa                    XEN=1 KMOD=1
  ipfiremake openswan                 XEN=1 KMOD=1
  ipfiremake mISDN                    XEN=1
  ipfiremake compat-wireless          XEN=1
#  ipfiremake linux                   XEN=1
#  ipfiremake atl2                    XEN=1
#  ipfiremake hso                     XEN=1
#  ipfiremake e1000e                  XEN=1
#  ipfiremake kqemu                   XEN=1
#  ipfiremake v4l-dvb                 XEN=1
#  ipfiremake madwifi                 XEN=1
+ ##  ipfiremake alsa                   XEN=1 KMOD=1
#  ipfiremake openswan                        XEN=1 KMOD=1
#  ipfiremake mISDN                   XEN=1
#  ipfiremake compat-wireless         XEN=1
    ipfiremake linux
    ipfiremake atl2
    ipfiremake hso
  #  ipfiremake x11libs
  #  ipfiremake xen
    ipfiremake miau
 -  ipfiremake net-snmp
 +  ipfiremake netsnmpd
    ipfiremake perl-DBI
    ipfiremake perl-DBD-mysql
    ipfiremake lcr
    ipfiremake nagiosql
    ipfiremake iftop
    ipfiremake motion
 +  ipfiremake joe
    echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
    cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
    echo >> $BASEDIR/build/var/ipfire/firebuild
@@@ -713,13 -712,13 +713,13 @@@ buildpackages() 
  
    ipfirepackages
  
-   # Check if there is a loop device for building in virtual environments
-   if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then
-         cp -f $BASEDIR/packages/linux-xen-*.ipfire $LFS/install/packages/
      ipfiremake xen-image ED=$IPFVER
      rm -rf $LFS/install/packages/linux-xen-*.ipfire
-   fi
-   mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1
#  # Check if there is a loop device for building in virtual environments
#  if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then
#        cp -f $BASEDIR/packages/linux-xen-*.ipfire $LFS/install/packages/
#     ipfiremake xen-image ED=$IPFVER
#     rm -rf $LFS/install/packages/linux-xen-*.ipfire
#  fi
#  mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1
  
    # Cleanup
    stdumount