From: ikseong <ikseong@vuplus>
Date: Fri, 23 Jul 2010 05:17:23 +0000 (+0900)
Subject: Merge commit 'opendreambox/opendreambox-1.6' into vuplus-1.6
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openembedded;a=commitdiff_plain;h=d2bb126b8dd79bb3670ddf27fd000e18449332db

Merge commit 'opendreambox/opendreambox-1.6' into vuplus-1.6

modify klibc inc files.
add new unionfs-modules bb file.
---

d2bb126b8dd79bb3670ddf27fd000e18449332db
diff --cc recipes/klibc/klibc.inc
index 1d98964,1ecf15f..4d07984
--- a/recipes/klibc/klibc.inc
+++ b/recipes/klibc/klibc.inc
@@@ -1,7 -1,7 +1,9 @@@
  require klibc-common.inc
  
  SRC_URI += "file://staging.patch;patch=1"
- SRC_URI_append = "${@base_conditional('MACHINE', 'dm7025', '', \
 -SRC_URI_append = "${@base_conditional('DISTRO', 'opendreambox', '', \
++#SRC_URI_append = "${@base_conditional('DISTRO', 'opendreambox', '', \
++#		' file://klibc_kexecsyscall.patch;patch=1', d)}"
++SRC_URI_append = "${@base_conditional('DISTRO', 'vuplus', '', \
  		' file://klibc_kexecsyscall.patch;patch=1', d)}"
  
  # we want only the shared programms and the lib so we chose them manually
diff --cc recipes/klibc/klibc_1.5.15.inc
index 6615ac2,2aeba26..d9353ea
--- a/recipes/klibc/klibc_1.5.15.inc
+++ b/recipes/klibc/klibc_1.5.15.inc
@@@ -7,6 -6,9 +6,11 @@@ SRC_URI += "file://staging.patch;patch=
              file://isystem.patch;patch=1 \
  	   "
  
 -SRC_URI_append = "${@base_conditional('DISTRO', 'opendreambox', '', \
++#SRC_URI_append = "${@base_conditional('DISTRO', 'opendreambox', '', \
++#		' file://klibc_kexecsyscall.patch;patch=1', d)}"
++SRC_URI_append = "${@base_conditional('DISTRO', 'vuplus', '', \
+ 		' file://klibc_kexecsyscall.patch;patch=1', d)}"
+ 
  # we want only the shared programms and the lib so we chose them manually
  do_install() {
          install -d ${D}${base_bindir}