Skip to contentSkip to conversation

lsbinitscripts: Don't compile

PATCH In review Saul Wold 1 participant 3 messages Dec 19, 2012

lore
Share & tools
lore

Saul Wold

author
#0 lore raw

PATCH 1/2 lsbinitscripts: Don't compile

Only functions macros is installed, so no need to configure or compile

[YOCTO #3584]

---
 meta/recipes-extended/lsb/lsbinitscripts_9.03.bb |    3 +++
 1 file changed, 3 insertions(+)
meta/recipes-extended/lsb/lsbinitscripts_9.03.bb +3 -0
index eac4ebb..e32a50c 100644
@@ -19,7 +19,10 @@ ALTERNATIVE_PRIORITY = "100"
 ALTERNATIVE_${PN} = "functions"
 ALTERNATIVE_LINK_NAME[functions] = "${sysconfdir}/init.d/functions"
 
+# Since we are only taking the patched version of functions, no need to
+# configure or compile anything so do not execute these
 do_configure[noexec] = "1" 
+do_compile[noexec] = "1" 
 
 do_install(){
 	install -d ${D}${sysconfdir}/init.d/
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH 2/2 icu: reduce what's needed for cross tools

The ICU Update copied to complete source tree over, it only needed a couple of binaries and libraries, so only copy those.

---
 meta/recipes-support/icu/icu.inc |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)
meta/recipes-support/icu/icu.inc +9 -7
index f7257d1..1329635 100644
@@ -7,7 +7,7 @@ DEPENDS = "icu-native"
 DEPENDS_class-native = ""
 
 S = "${WORKDIR}/icu/source"
-STAGING_ICU_SOURCE_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/icu"
+STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}"
 
 PARALLEL_MAKE = ""
 FULL_OPTIMIZATION_arm = "-Os"
@@ -17,7 +17,7 @@ inherit autotools pkgconfig binconfig
 # ICU needs the native build directory as an argument to its --with-cross-build option when
 # cross-compiling. Taken the situation that different builds may share a common sstate-cache
 # into consideration, the native build directory needs to be staged.
-EXTRA_OECONF = "--with-cross-build=${STAGING_DATADIR_NATIVE}/icu/source"
+EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}"
 EXTRA_OECONF_class-native = ""
 
 # ICU puts custom m4 autoconf functions in aclocal.m4.
@@ -29,11 +29,13 @@ do_configure_prepend() {
     [ -f acinclude.m4 ] || cp aclocal.m4 acinclude.m4
 }
 
-do_install_append() {
-    if [ ${PN} == 'icu-native' ]; then
-	mkdir -p ${D}/${STAGING_ICU_SOURCE_DIR_NATIVE}
-	cp -r ${S} ${D}/${STAGING_ICU_SOURCE_DIR_NATIVE}
-    fi
+do_install_append_class-native() {
+	mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config
+	cp -r ${S}/config/icucross.mk ${D}/${STAGING_ICU_DIR_NATIVE}/config
+	cp -r ${S}/lib ${D}/${STAGING_ICU_DIR_NATIVE}
+	cp -r ${S}/bin ${D}/${STAGING_ICU_DIR_NATIVE}
+	cp -r ${S}/tools ${D}/${STAGING_ICU_DIR_NATIVE}
+
 }
 
 PACKAGES =+ "libicudata libicuuc libicui18n libicule libiculx libicutu libicuio"
Signature · 1 line
1.7.9.5
author
#2 lore raw
In reply to Saul Wold

really 1/1 some randomness happened and 2/2 never made it to the list!

Sau!

Quoted 25 lines · Saul Wold

Only functions macros is installed, so no need to configure or compile

[YOCTO #3584]

---
  meta/recipes-extended/lsb/lsbinitscripts_9.03.bb |    3 +++
  1 file changed, 3 insertions(+)
meta/recipes-extended/lsb/lsbinitscripts_9.03.bb +3 -0
index eac4ebb..e32a50c 100644
@@ -19,7 +19,10 @@ ALTERNATIVE_PRIORITY = "100"
  ALTERNATIVE_${PN} = "functions"
  ALTERNATIVE_LINK_NAME[functions] = "${sysconfdir}/init.d/functions"
 
+# Since we are only taking the patched version of functions, no need to
+# configure or compile anything so do not execute these
  do_configure[noexec] = "1"
+do_compile[noexec] = "1"
 
  do_install(){
  	install -d ${D}${sysconfdir}/init.d/