merge of 133a287639dd166886ae2319eb8501109f2e2f1a

     and df9da1d22b503804994b621b7260dbb249555e30

6 files changed, 17 insertions, 51 deletions

diff --git a/packages/gpe-mininet/gpe-mininet-0.4/.mtn2git_empty b/packages/gpe-mininet/gpe-mininet-0.4/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gpe-mininet/gpe-mininet-0.4/.mtn2git_empty
+++ /dev/null
diff --git a/packages/gpe-mininet/gpe-mininet-0.4/mininet-main.patch b/packages/gpe-mininet/gpe-mininet-0.4/mininet-main.patch
deleted file mode 100644
index 3427673006..0000000000
--- a/packages/gpe-mininet/gpe-mininet-0.4/mininet-main.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: main.c
-===================================================================
-RCS file: /cvs/gpe/base/gpe-mininet/main.c,v
-retrieving revision 1.7
-diff -u -r1.7 main.c
---- main.c	9 Jun 2004 22:52:09 -0000	1.7
-+++ main.c	9 Jul 2004 18:46:58 -0000
-@@ -329,7 +329,7 @@
- 	GdkPixbuf *pixmap;
- 
- 	/* first check firewall stuff */
--	activate_networking_rules();
-+//	activate_networking_rules();
- 	
- 	if (gpe_application_init (&argc, &argv) == FALSE)
- 		exit (1);
diff --git a/packages/gpe-mininet/gpe-mininet-0.4/netlink.patch b/packages/gpe-mininet/gpe-mininet-0.4/netlink.patch
deleted file mode 100644
index 4f65dc7eaf..0000000000
--- a/packages/gpe-mininet/gpe-mininet-0.4/netlink.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: netlink.c
-===================================================================
-RCS file: /cvs/gpe/base/gpe-mininet/netlink.c,v
-retrieving revision 1.2
-diff -u -r1.2 netlink.c
---- netlink.c	17 Apr 2004 16:14:03 -0000	1.2
-+++ netlink.c	9 Jul 2004 06:12:37 -0000
-@@ -16,7 +16,6 @@
- #include <stdio.h>
- #include <sys/socket.h>
- #include <linux/types.h>
--#include <linux/uio.h>
- 
- #include <linux/netlink.h>
- #include <linux/rtnetlink.h>
diff --git a/packages/gpe-mininet/gpe-mininet_0.4.bb b/packages/gpe-mininet/gpe-mininet_0.4.bb
deleted file mode 100644
index 79b9e7b26d..0000000000
--- a/packages/gpe-mininet/gpe-mininet_0.4.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-inherit gpe pkgconfig
-
-PR = "r1"
-LICENSE = "GPL"
-DEPENDS = "libgpewidget gpe-icons gpe-conf matchbox-panel"
-SECTION = "gpe"
-
-DESCRIPTION = "GPE network connection checker"
-
-SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz \
-           file://netlink.patch;patch=1;pnum=0 \
-           file://mininet-main.patch;patch=1;pnum=0"
-
-FILES_${PN} = " ${bindir} ${datadir}/pixmaps ${datadir}/applications"
-FILES_${PN} += " ${datadir}/gpe/pixmaps"
-
-export CVSBUILD="no"
diff --git a/packages/gpe-mininet/gpe-mininet_0.7.bb b/packages/gpe-mininet/gpe-mininet_0.7.bb
new file mode 100644
index 0000000000..da95c97343
--- /dev/null
+++ b/packages/gpe-mininet/gpe-mininet_0.7.bb
@@ -0,0 +1,14 @@
+inherit autotools gpe pkgconfig
+
+PR = "r0"
+LICENSE = "GPL"
+DEPENDS = "libgpewidget gpe-icons gpe-conf"
+RRECOMMENDS = "gpe-conf"
+SECTION = "gpe"
+
+DESCRIPTION = "GPE network connection checker"
+
+SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2"
+
+FILES_${PN} = " ${bindir} ${datadir}/pixmaps ${datadir}/applications"
+FILES_${PN} += " ${datadir}/gpe/pixmaps"
diff --git a/packages/linux/ixp4xx-kernel_2.6.15.1.bb b/packages/linux/ixp4xx-kernel_2.6.15.1.bb
index 8e120fd0df..b4cde1bf41 100644
--- a/packages/linux/ixp4xx-kernel_2.6.15.1.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.15.1.bb
@@ -3,12 +3,12 @@
 # Increment PR_CONFIG for changes to the ixp4xx-kernel specific
 # defconfig (do *NOT* increment anything in here for changes
 # to other kernel configs!)
-PR_CONFIG = "0"
+PR_CONFIG = "1"
 #
 # Increment the number below (i.e. the digits after PR) when
 # making changes within this file or for changes to the patches
 # applied to the kernel.
-PR = "r0.${PR_CONFIG}"
+PR = "r8.${PR_CONFIG}"
 
 include ixp4xx-kernel.inc
 
@@ -21,7 +21,6 @@ IXP4XX_PATCHES += "file://11-mtdpart-redboot-config-byteswap.patch;patch=1"
 IXP4XX_PATCHES += "file://15-jffs2-endian-config.patch;patch=1"
 IXP4XX_PATCHES += "file://40-rtc-class.patch;patch=1"
 IXP4XX_PATCHES += "file://45-eeprom-notifier.patch;patch=1"
-IXP4XX_PATCHES += "file://48-setup-byteswap-cmdline.patch;patch=1"
 IXP4XX_PATCHES += "file://50-nas100d-arch.patch;patch=1"
 IXP4XX_PATCHES += "file://55-rtc-pcf8563.patch;patch=1"
 IXP4XX_PATCHES += "file://60-nas100d-i2c.patch;patch=1"
@@ -38,5 +37,6 @@ IXP4XX_PATCHES += "file://91-maclist.patch;patch=1"
 IXP4XX_PATCHES += "file://92-nas100d-maclist.patch;patch=1"
 IXP4XX_PATCHES += "file://92-nslu2-maclist.patch;patch=1"
 IXP4XX_PATCHES += "file://93-loft-maclist.patch;patch=1"
+IXP4XX_PATCHES += "file://94-loft-setup.patch;patch=1"
 IXP4XX_PATCHES += "file://94-nas100d-setup.patch;patch=1"
 IXP4XX_PATCHES += "file://94-nslu2-setup.patch;patch=1"