12 files changed, 25 insertions, 7 deletions
diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo/compile.patch b/packages/gpe-ownerinfo/gpe-ownerinfo/compile.patch
new file mode 100644
index 0000000000..3406481d66
--- /dev/null
+++ b/packages/gpe-ownerinfo/gpe-ownerinfo/compile.patch
@@ -0,0 +1,13 @@
+Index: gpe-ownerinfo-0.28/Makefile
+===================================================================
+--- gpe-ownerinfo-0.28.orig/Makefile
++++ gpe-ownerinfo-0.28/Makefile
+@@ -40,7 +40,7 @@ all: $(PACKAGE) all-mo
+ 
+ $(LIB_TARGET): $(LIB_OBJS)
+ 	rm -f $@
+-	ar cq $@ $^
++	$(AR) cq $@ $^
+ 
+ $(PACKAGE): $(OBJS) $(LIB_TARGET)
+ 	$(CC) -o $@ $^ $(LDFLAGS) $(PACKAGE_LDFLAGS) -L. -lgpe-ownerinfo
diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_0.28.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_0.28.bb
index f04b9c19be..e17c6a6798 100644
--- a/packages/gpe-ownerinfo/gpe-ownerinfo_0.28.bb
+++ b/packages/gpe-ownerinfo/gpe-ownerinfo_0.28.bb
@@ -5,7 +5,9 @@ SECTION = "gpe"
 PRIORITY = "optional"
 DEPENDS = "gtk+ libgpewidget"
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
+
+SRC_URI += "file://compile.patch;patch=1"
 
 do_stage () {
 	oe_libinstall -a libgpe-ownerinfo ${STAGING_LIBDIR}
diff --git a/packages/linux/linux-rp_2.6.20.bb b/packages/linux/linux-rp_2.6.20.bb
index 3504014ffd..49446a772a 100644
--- a/packages/linux/linux-rp_2.6.20.bb
+++ b/packages/linux/linux-rp_2.6.20.bb
@@ -1,6 +1,6 @@
 require linux-rp.inc
 
-PR = "r5"
+PR = "r6"
 
 # Handy URLs
 # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
@@ -39,6 +39,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2 \
            ${RPSRC}/poodle_pm-r3.patch;patch=1 \
            ${RPSRC}/pxa27x_overlay-r5.patch;patch=1 \
            ${RPSRC}/w100_extaccel-r0.patch;patch=1 \
+           ${RPSRC}/w100_extmem-r0.patch;patch=1 \
            file://hostap-monitor-mode.patch;patch=1 \
            file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
            ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \
diff --git a/packages/s3c2410-utils/sjf2410-linux-native_20060807.bb b/packages/s3c2410-utils/sjf2410-linux-native_20060807.bb
index 70cc6c7424..53b2d0c8e0 100644
--- a/packages/s3c2410-utils/sjf2410-linux-native_20060807.bb
+++ b/packages/s3c2410-utils/sjf2410-linux-native_20060807.bb
@@ -29,4 +29,4 @@ do_install() {
 	:
 }
 
-addtask deploy before do_build after do_compile
+addtask deploy before do_package after do_install
diff --git a/packages/s3c2410-utils/sjf2410-linux-native_svn.bb b/packages/s3c2410-utils/sjf2410-linux-native_svn.bb
index 55176029ab..60cce4a3e2 100644
--- a/packages/s3c2410-utils/sjf2410-linux-native_svn.bb
+++ b/packages/s3c2410-utils/sjf2410-linux-native_svn.bb
@@ -29,4 +29,4 @@ do_install() {
 	:
 }
 
-addtask deploy before do_build after do_compile
+addtask deploy before do_package after do_install
diff --git a/packages/uboot-utils/files/.mtn2git_empty b/packages/uboot-utils/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/uboot-utils/files/.mtn2git_empty
diff --git a/packages/uboot-utils/env-Makefile.patch b/packages/uboot-utils/files/env-Makefile.patch
index ad3a6b39a3..ad3a6b39a3 100644
--- a/packages/uboot-utils/env-Makefile.patch
+++ b/packages/uboot-utils/files/env-Makefile.patch
diff --git a/packages/uboot-utils/fw_env.c.patch b/packages/uboot-utils/files/fw_env.c.patch
index 62f364ad4a..62f364ad4a 100644
--- a/packages/uboot-utils/fw_env.c.patch
+++ b/packages/uboot-utils/files/fw_env.c.patch
diff --git a/packages/uboot-utils/fw_env.h.patch b/packages/uboot-utils/files/fw_env.h.patch
index 2ef2bb83c4..2ef2bb83c4 100644
--- a/packages/uboot-utils/fw_env.h.patch
+++ b/packages/uboot-utils/files/fw_env.h.patch
diff --git a/packages/uboot-utils/tools-Makefile.patch b/packages/uboot-utils/files/tools-Makefile.patch
index a44bc917d6..a44bc917d6 100644
--- a/packages/uboot-utils/tools-Makefile.patch
+++ b/packages/uboot-utils/files/tools-Makefile.patch
diff --git a/packages/uboot-utils/uboot-utils_1.1.2.bb b/packages/uboot-utils/uboot-utils_1.1.2.bb
index 3bcf1eba6c..4786b238a9 100644
--- a/packages/uboot-utils/uboot-utils_1.1.2.bb
+++ b/packages/uboot-utils/uboot-utils_1.1.2.bb
@@ -3,9 +3,9 @@ SECTION = "bootloaders"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "mtd-utils"
+PR = "2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/u-boot/u-boot-${PV}.tar.bz2 \
-	 file://fw_env.h.patch;patch=1 \
 	 file://fw_env.c.patch;patch=1 \
 	 file://tools-Makefile.patch;patch=1 \
 	 file://env-Makefile.patch;patch=1 "
@@ -33,7 +33,9 @@ do_stage() {
 }
 
 do_install () {
-	install -d     ${D}/sbin
+	install -d	${D}/sbin
+	install -d	${D}${sysconfdir}
 	install -m 755 ${S}/tools/env/fw_printenv ${D}/sbin/fw_printenv
 	install -m 755 ${S}/tools/env/fw_printenv ${D}/sbin/fw_setenv
+	install -m 644 ${S}/tools/env/fw_env.config ${D}${sysconfdir}/fw_env.config
 }
diff --git a/packages/uboot/u-boot-mkimage-gta01-native_svn.bb b/packages/uboot/u-boot-mkimage-gta01-native_svn.bb
index ad98bea30e..c93507fdd0 100644
--- a/packages/uboot/u-boot-mkimage-gta01-native_svn.bb
+++ b/packages/uboot/u-boot-mkimage-gta01-native_svn.bb
@@ -15,4 +15,4 @@ do_deploy () {
 }
 
 do_deploy[dirs] = "${S}"
-addtask deploy before do_build after do_compile
+addtask deploy before do_package after do_install