merge of '6cea0e089de18ef78c84f8d8e47107c117a92a40'

     and 'c8012b91de659c67894e88977d46721ae112706f'

2 files changed, 10 insertions, 4 deletions

diff --git a/packages/meta/slugos-native.bb b/packages/meta/slugos-native.bb
index f0ffbd8415..9dae7e8df3 100644
--- a/packages/meta/slugos-native.bb
+++ b/packages/meta/slugos-native.bb
@@ -5,7 +5,7 @@
 #
 DESCRIPTION = "Packages that are required for the SlugOS native build environment"
 LICENSE = "MIT"
-PR = "r6"
+PR = "r7"
 
 INHIBIT_DEFAULT_DEPS = "1"
 EXCLUDE_FROM_WORLD = "1"
@@ -14,6 +14,9 @@ PACKAGES = "${PN}"
 
 inherit meta
 
+do_package_write_ipk() {
+}
+
 # Run-time only (RDEPENDS) stuff - no package explicitly provides
 # these targets.
 SLUGOS_NATIVE_RT_prepend_linux = "\
diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index 4ecacb85bc..e74fe9424c 100644
--- a/packages/meta/slugos-packages.bb
+++ b/packages/meta/slugos-packages.bb
@@ -5,7 +5,7 @@
 DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r38"
+PR = "r39"
 CONFLICTS = "db3"
 
 COMPATIBLE_MACHINE = "nslu2"
@@ -13,8 +13,6 @@ EXCLUDE_FROM_WORLD = "1"
 INHIBIT_DEFAULT_DEPS = "1"
 ALLOW_EMPTY = "1"
 
-inherit meta
-
 # The list of packages to build for the slugos DISTRO.
 # KEEP IN ALPHABETICAL ORDER
 # Do *not* simply comment out a line. That will break. Instead
@@ -252,3 +250,8 @@ DEPENDS = "\
 	${SLUGOS_EXTRA_PACKAGES} \
 	package-index \
 	"
+
+inherit meta
+
+do_package_write_ipk() {
+}