From bea72c2fecde175add169bb55df1922b048030c8 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Fri, 30 Oct 2009 21:48:21 +0000
Subject: Start removal of layout_* variables and replace these with new
 mechanisms to allow nextgen SDK generation (from Poky)

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 conf/distro/iphone-compat.conf       | 2 +-
 conf/distro/micro.conf               | 4 ++--
 conf/distro/sharprom-compatible.conf | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'conf/distro')

diff --git a/conf/distro/iphone-compat.conf b/conf/distro/iphone-compat.conf
index 74edc0fb53..be2017b7c5 100644
--- a/conf/distro/iphone-compat.conf
+++ b/conf/distro/iphone-compat.conf
@@ -5,7 +5,7 @@ DISTRO_NAME = "iphone-compat"
 TARGET_OS = "darwin9"
 TARGET_VENDOR = "-apple"
 
-export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${layout_libdir} -Wl,-L${STAGING_DIR_TARGET}${layout_libdir}"
+export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${libdir} -Wl,-L${STAGING_DIR_TARGET}${libdir}"
 
 # Compiler selection
 PREFERRED_PROVIDER_linux-libc-headers                       = "iphone-sdks"
diff --git a/conf/distro/micro.conf b/conf/distro/micro.conf
index 43b00f7958..a1220ee592 100644
--- a/conf/distro/micro.conf
+++ b/conf/distro/micro.conf
@@ -97,8 +97,8 @@ ENABLE_BINARY_LOCALE_GENERATION = "0"
 PACKAGE_SNAP_LIB_SYMLINKS = "1"
 
 # Collapse /usr into /
-layout_prefix = ""
-layout_exec_prefix = ""
+prefix = ""
+exec_prefix = ""
 
 # Don't install ldconfig and associated gubbins
 USE_LDCONFIG = "0"
diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf
index bd3b93ec17..2ef04872fb 100644
--- a/conf/distro/sharprom-compatible.conf
+++ b/conf/distro/sharprom-compatible.conf
@@ -21,7 +21,7 @@ OEINCLUDELOGS = "yes"
 KERNEL_CONSOLE = "tty1"
 # prebuilt toolchain doesn't know about -isystem
 export BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
-export TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}/${layout_includedir}"
+export TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}/${includedir}"
 #DEBUG_OPTIMIZATION = "-O -g3"
 #DEBUG_BUILD = "1"
 
-- 
cgit v1.2.3


From f5fbf1ff3ebbb35bdc6935decdd86f11ec415ff1 Mon Sep 17 00:00:00 2001
From: Michael 'Mickey' Lauer <mickey@vanille-media.de>
Date: Wed, 11 Nov 2009 02:34:21 +0100
Subject: libnl2: new recipe; netlink support library v2

---
 conf/distro/include/sane-srcrevs.inc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'conf/distro')

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index b57ea4d673..ca88ae564d 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -89,6 +89,7 @@ SRCREV_pn-libmokogsmd2 ?= "4334"
 SRCREV_pn-libmokojournal2 ?= "3473"
 SRCREV_pn-libmokopanelui2 ?= "4568"
 SRCREV_pn-libmokoui2 ?= "4342"
+SRCREV_pn-libnl2 ?= "dc273a12da9f0116e80fa81d63beb820e632dd17"
 SRCREV_pn-libowl ?= "277"
 SRCREV_pn-librfid ?= "2094"
 SRCREV_pn-libsnmp-perl ?= "17367"
-- 
cgit v1.2.3