diff options
| author | Rod Whitby <rod@whitby.id.au> | 2005-12-05 18:49:59 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-12-05 18:49:59 +0000 |
| commit | db9099806c46c4fc4be11d0a038a8015dc6ccffa (patch) | |
| tree | fbd6b2d82f72f2091103367ea4f2a1c0d6e82774 | |
| parent | 386066aa42d543e3916be0bebcf5ff38efda5400 (diff) | |
| parent | bf17c3a64782ea292f63b3662a409365804dfeb7 (diff) | |
merge of 643f20dce93bd762af1d4851da51ff1a73427476
and 8d84c2b7d68f0db4213acc29ad871140c3dadfd2
| -rw-r--r-- | packages/gtkhtml/gtkhtml-3.6_3.6.2.bb | 18 | ||||
| -rw-r--r-- | packages/linux/nslu2-kernel_2.6.15-rc5.bb (renamed from packages/linux/nslu2-kernel_2.6.15-rc2.bb) | 3 |
2 files changed, 19 insertions, 2 deletions
diff --git a/packages/gtkhtml/gtkhtml-3.6_3.6.2.bb b/packages/gtkhtml/gtkhtml-3.6_3.6.2.bb new file mode 100644 index 0000000000..6194529aa0 --- /dev/null +++ b/packages/gtkhtml/gtkhtml-3.6_3.6.2.bb @@ -0,0 +1,18 @@ +LICENSE = "GPL" +SECTION = "x11/libs" +DESCRIPTION = "HTML rendering/editing library" +DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui" + +inherit gnome + +SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.6/gtkhtml-${PV}.tar.bz2" +FILES_${PN} += "${datadir}/gtkhtml-3.6" +S = "${WORKDIR}/gtkhtml-${PV}" + +EXTRA_OECONF = "--disable-gtk-doc" + +do_stage() { + mv src/libgtkhtml.pc src/libgtkhtml-3.6.pc || true + gnome_stage_includes + oe_libinstall -C src -so libgtkhtml-3.6 ${STAGING_LIBDIR} +} diff --git a/packages/linux/nslu2-kernel_2.6.15-rc2.bb b/packages/linux/nslu2-kernel_2.6.15-rc5.bb index 307d690f13..659ddd0eae 100644 --- a/packages/linux/nslu2-kernel_2.6.15-rc2.bb +++ b/packages/linux/nslu2-kernel_2.6.15-rc5.bb @@ -8,7 +8,7 @@ PR_CONFIG = "0" # 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 = "r3.${PR_CONFIG}" +PR = "r0.${PR_CONFIG}" include nslu2-kernel.inc @@ -23,7 +23,6 @@ N2K_PATCHES = "\ file://75-nslu2-leds.patch;patch=1 \ file://80-nslu2-io.patch;patch=1 \ file://81-nslu2-class-device-create.patch;patch=1 \ - file://90-ixp4xx-nslu2.patch;patch=1 \ file://20-timer.patch;patch=1 \ file://91-maclist.patch;patch=1 \ file://92-nslu2-maclist.patch;patch=1 \ |