5 files changed, 20 insertions, 14 deletions

diff --git a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
index f644c51762..7f4f2b00bb 100644
--- a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
+++ b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
@@ -20,6 +20,7 @@ PREFERRED_VERSION_libdrm ?= ""
 PREFERRED_VERSION_xf86-input-keyboard ?= ""
 PREFERRED_VERSION_dri2proto ?= ""
 PREFERRED_VERSION_carrick ?= "1.1.13"
+PREFERRED_VERSION_nbtk ?= "1.2.3"
 
 
 SRCREV_pn-libdrm ?= "3f3c5be6f908272199ccf53f108b1124bfe0a00e"
diff --git a/meta-moblin/conf/distro/include/moblin-floating-revisions.inc b/meta-moblin/conf/distro/include/moblin-floating-revisions.inc
index 31ed13fd78..999e0d1dfa 100644
--- a/meta-moblin/conf/distro/include/moblin-floating-revisions.inc
+++ b/meta-moblin/conf/distro/include/moblin-floating-revisions.inc
@@ -48,6 +48,7 @@ SRCREV_pn-mutter ?= "${AUTOREV}"
 SRCREV_pn-mutter-moblin ?= "${AUTOREV}"
 SRCREV_pn-mux ?= "${AUTOREV}"
 SRCREV_pn-nbtk ?= "${AUTOREV}"
+PREFERRED_VERSION_nbtk ?= "1.2.3+git%
 SRCREV_pn-mx ?= "${AUTOREV}"
 SRCREV_pn-qemugl ?= "${AUTOREV}"
 SRCREV_pn-sample-media ?= "${AUTOREV}"
diff --git a/meta-moblin/packages/nbtk/nbtk.inc b/meta-moblin/packages/nbtk/nbtk.inc
new file mode 100644
index 0000000000..76bfa68e94
--- /dev/null
+++ b/meta-moblin/packages/nbtk/nbtk.inc
@@ -0,0 +1,15 @@
+DESCRIPTION = "Moblin toolkit library for netbooks"
+SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
+SRC_URI = "http://download.moblin.org/sources/${PN}/1.2/${PN}-${PV}.tar.bz2"
+LICENSE = "LGPLv2.1"
+PR = "r4"
+DEPENDS = "clutter-1.0 libccss clutter-imcontext"
+
+EXTRA_OECONF = "--disable-introspection"
+
+inherit autotools_stage
+
+do_configure_prepend () {
+        echo "EXTRA_DIST=" > ${S}/gtk-doc.make
+        touch ${S}/INSTALL
+}
diff --git a/meta-moblin/packages/nbtk/nbtk_1.2.3.bb b/meta-moblin/packages/nbtk/nbtk_1.2.3.bb
new file mode 100644
index 0000000000..d3eaf3449b
--- /dev/null
+++ b/meta-moblin/packages/nbtk/nbtk_1.2.3.bb
@@ -0,0 +1 @@
+require nbtk.inc
diff --git a/meta-moblin/packages/nbtk/nbtk_git.bb b/meta-moblin/packages/nbtk/nbtk_git.bb
index 2089c88c5b..0caf4ecc75 100644
--- a/meta-moblin/packages/nbtk/nbtk_git.bb
+++ b/meta-moblin/packages/nbtk/nbtk_git.bb
@@ -1,17 +1,5 @@
-DESCRIPTION = "Moblin toolkit library for netbooks"
+require nbtk.inc
+
 SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-LICENSE = "LGPLv2.1"
 PV = "1.2.3+git${SRCPV}"
-PR = "r4"
-DEPENDS = "clutter-1.0 libccss clutter-imcontext"
-
-EXTRA_OECONF = "--disable-introspection"
-
 S = "${WORKDIR}/git"
-
-inherit autotools_stage
-
-do_configure_prepend () {
-        echo "EXTRA_DIST=" > ${S}/gtk-doc.make
-        touch ${S}/INSTALL
-}