diff options
| author | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2009-11-11 09:12:43 +0100 |
|---|---|---|
| committer | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2009-11-11 09:12:43 +0100 |
| commit | e29d9570bbee5d8d721517a413b9dbf1f9b6892e (patch) | |
| tree | e0040ffa4135e1b65bbdcd462b12d49ddab6a5c9 /conf/distro | |
| parent | 87df1cab8dd6ca28ec1fccf67e0f77f426e25e25 (diff) | |
| parent | caec0ee3d05082277c1af4863b6d653109f5714e (diff) | |
Merge branch 'org.openembedded.dev' of ssh+git://git@git.openembedded.net/openembedded into org.openembedded.dev
Diffstat (limited to 'conf/distro')
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 1 | ||||
| -rw-r--r-- | conf/distro/iphone-compat.conf | 2 | ||||
| -rw-r--r-- | conf/distro/micro.conf | 4 | ||||
| -rw-r--r-- | conf/distro/sharprom-compatible.conf | 2 |
4 files changed, 5 insertions, 4 deletions
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" 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" |