diff options
| author | Rod Whitby <rod@whitby.id.au> | 2007-03-08 23:11:07 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2007-03-08 23:11:07 +0000 |
| commit | 3aeaac33bc061b342afc064800c00b1d49f3002a (patch) | |
| tree | 661a6f36cf01b1643cdc03a65adafb9048b97bdc | |
| parent | 8102686fbb57b1eb74235f9dd08a9dc6a065bb6a (diff) | |
| parent | 4d37fa8011c7976226f659388384eebdb95cd73c (diff) | |
merge of 'b4827e098fbbf66579c962a3d189b3e622b94406'
and 'df3adfe2ad30b67a7d45f03207aeb8fda510c37b'
| -rw-r--r-- | packages/gpe-ownerinfo/gpe-ownerinfo/compile.patch | 13 | ||||
| -rw-r--r-- | packages/gpe-ownerinfo/gpe-ownerinfo_0.28.bb | 4 | ||||
| -rw-r--r-- | packages/linux/linux-rp_2.6.20.bb | 3 |
3 files changed, 18 insertions, 2 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 \ |