From 0dce78f68905d9acdb94b7a54e199cf8a261fe28 Mon Sep 17 00:00:00 2001
From: John Bowler <jbowler@nslu2-linux.org>
Date: Mon, 5 Dec 2005 18:23:01 +0000
Subject: nslu2-kernel: release 2.6.15-rc5  - this is the first RC (GIT
 snapshot - see the comments in the release    notes) which compiles since
 rc2, no verification that it actually runs    at this point.  The RTC is
 probably still broken (as it was in rc2).

---
 packages/linux/nslu2-kernel_2.6.15-rc2.bb | 37 -------------------------------
 packages/linux/nslu2-kernel_2.6.15-rc5.bb | 36 ++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 37 deletions(-)
 delete mode 100644 packages/linux/nslu2-kernel_2.6.15-rc2.bb
 create mode 100644 packages/linux/nslu2-kernel_2.6.15-rc5.bb

diff --git a/packages/linux/nslu2-kernel_2.6.15-rc2.bb b/packages/linux/nslu2-kernel_2.6.15-rc2.bb
deleted file mode 100644
index 307d690f13..0000000000
--- a/packages/linux/nslu2-kernel_2.6.15-rc2.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-# Kernel for NSLU2
-#
-# Increment PR_CONFIG for changes to the nslu2-kernel specific
-# defconfig (do *NOT* increment anything in here for changes
-# to other kernel configs!)
-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}"
-
-include nslu2-kernel.inc
-
-# N2K_PATCHES - full list of patches to apply
-N2K_PATCHES = "\
-	file://00-memory-h-page-shift.patch;patch=1 \
-	file://10-mtdpart-redboot-fis-byteswap.patch;patch=1 \
-	file://19-jffs2-force-be.patch;patch=1 \
-	file://55-rtc-x1205.patch;patch=1 \
-	file://60-nslu2-beeper.patch;patch=1 \
-	file://60-nslu2-rtc.patch;patch=1 \
-	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 \
-	file://anonymiser.patch;patch=1 \
-"
-
-# These options get added to the kernel command line, only put things
-# specific to the bootstrap of *this* kernel in here - DISTRO specfic
-# config must be in CMDLINE_ROOT (see the full definition of CMDLINE
-# in nslu2-kernel.inc)
-CMDLINE_KERNEL_OPTIONS = "x1205.hctosys=1"
diff --git a/packages/linux/nslu2-kernel_2.6.15-rc5.bb b/packages/linux/nslu2-kernel_2.6.15-rc5.bb
new file mode 100644
index 0000000000..659ddd0eae
--- /dev/null
+++ b/packages/linux/nslu2-kernel_2.6.15-rc5.bb
@@ -0,0 +1,36 @@
+# Kernel for NSLU2
+#
+# Increment PR_CONFIG for changes to the nslu2-kernel specific
+# defconfig (do *NOT* increment anything in here for changes
+# to other kernel configs!)
+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 = "r0.${PR_CONFIG}"
+
+include nslu2-kernel.inc
+
+# N2K_PATCHES - full list of patches to apply
+N2K_PATCHES = "\
+	file://00-memory-h-page-shift.patch;patch=1 \
+	file://10-mtdpart-redboot-fis-byteswap.patch;patch=1 \
+	file://19-jffs2-force-be.patch;patch=1 \
+	file://55-rtc-x1205.patch;patch=1 \
+	file://60-nslu2-beeper.patch;patch=1 \
+	file://60-nslu2-rtc.patch;patch=1 \
+	file://75-nslu2-leds.patch;patch=1 \
+	file://80-nslu2-io.patch;patch=1 \
+	file://81-nslu2-class-device-create.patch;patch=1 \
+	file://20-timer.patch;patch=1 \
+	file://91-maclist.patch;patch=1 \
+	file://92-nslu2-maclist.patch;patch=1 \
+	file://anonymiser.patch;patch=1 \
+"
+
+# These options get added to the kernel command line, only put things
+# specific to the bootstrap of *this* kernel in here - DISTRO specfic
+# config must be in CMDLINE_ROOT (see the full definition of CMDLINE
+# in nslu2-kernel.inc)
+CMDLINE_KERNEL_OPTIONS = "x1205.hctosys=1"
-- 
cgit v1.2.3


From bf17c3a64782ea292f63b3662a409365804dfeb7 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Mon, 5 Dec 2005 18:48:19 +0000
Subject: gtkhtml: add 3.6.2

---
 packages/gtkhtml/gtkhtml-3.6_3.6.2.bb | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 packages/gtkhtml/gtkhtml-3.6_3.6.2.bb

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}
+}
-- 
cgit v1.2.3