Skip to contentSkip to conversation

Clean host path in target scripts

PATCH In review [email protected] 1 participant 6 messages Nov 14, 2014 – Nov 17, 2014

lore
Share & tools
lore

[email protected]

author
#0 lore raw

v2 cover Clean host path in target scripts

From: Wenzong Fan <[email protected]>

v2 changes:

* correct signature infos
* clean more for tcl:

TCL_BUILD_LIB_SPEC, TCL_SRC_DIR, TCL_BUILD_STUB_LIB_SPEC, TCL_BUILD_STUB_LIB_PATH

The following changes since commit edaeb8940813b620090a0797ad3b6a076897512d:

bitbake: cooker.py: fix loginfo op being set to an invalid value (2014-11-12 17:04:50 +0000)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib wenzong/clean-path
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=wenzong/

Shiqun Lin (4):
bash: clean host path in bashbug
e2fsprogs: clean host path in compile_et, mk_cmds
bind: clean host path in isc-config.sh
tcl: clean host path in tclConfig.sh

 meta/recipes-connectivity/bind/bind_9.9.5.bb       |    7 +++++++
 .../recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb |    6 ++++++
 meta/recipes-devtools/tcltk/tcl_8.6.2.bb           |    5 +++++
 meta/recipes-extended/bash/bash.inc                |    4 ++++
 4 files changed, 22 insertions(+)
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH v2 1/4 bash: clean host path in bashbug

From: Shiqun Lin <[email protected]>

* /usr/bin/bashbug

Signed-off-by Shiqun Lin <[email protected]>
Signed-off-by Wenzong Fan <[email protected]>
---
 meta/recipes-extended/bash/bash.inc |    4 ++++
 1 file changed, 4 insertions(+)
meta/recipes-extended/bash/bash.inc +4 -0
index 2fe0c6b..d35d25c 100644
@@ -38,6 +38,10 @@ do_install_append () {
 		mv ${D}${bindir}/bash ${D}${base_bindir}
 	fi
 }
+do_install_append_class-target () {
+	# Clean host path in bashbug
+	sed -i -e "s,${STAGING_DIR_TARGET},,g" ${D}${bindir}/bashbug
+}
 
 do_install_ptest () {
 	make INSTALL_TEST_DIR=${D}${PTEST_PATH}/tests install-test
Signature · 1 line
1.7.9.5
author
#2 lore raw

PATCH v2 2/4 e2fsprogs: clean host path in compile_et, mk_cmds

In reply to [email protected]

From: Shiqun Lin <[email protected]>

* /usr/bin/compile_et
* /usr/bin/mk_cmds

Signed-off-by Shiqun Lin <[email protected]>
Signed-off-by Wenzong Fan <[email protected]>
---
 .../recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb |    6 ++++++
 1 file changed, 6 insertions(+)
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb +6 -0
index f89e5ac..1fb4a6cd 100644
@@ -54,6 +54,12 @@ do_install () {
 	mv ${D}${bindir}/chattr ${D}${base_bindir}/chattr.e2fsprogs
 }
 
+do_install_append_class-target() {
+	# Clean host path in compile_et, mk_cmds
+	sed -i -e "s,ET_DIR=\"${S}/lib/et\",ET_DIR=\"${datadir}/et\",g" ${D}${bindir}/compile_et
+	sed -i -e "s,SS_DIR=\"${S}/lib/ss\",SS_DIR=\"${datadir}/ss\",g" ${D}${bindir}/mk_cmds
+}
+
 RDEPENDS_e2fsprogs = "e2fsprogs-badblocks"
 RRECOMMENDS_e2fsprogs = "e2fsprogs-mke2fs e2fsprogs-e2fsck"
Signature · 1 line
1.7.9.5
author
#3 lore raw

PATCH v2 3/4 bind: clean host path in isc-config.sh

In reply to [email protected]

From: Shiqun Lin <[email protected]>

* /usr/bin/isc-config.sh
* /usr/bin/bind9-config - hardlink to isc-config.sh

Signed-off-by Shiqun Lin <[email protected]>
Signed-off-by Wenzong Fan <[email protected]>
---
 meta/recipes-connectivity/bind/bind_9.9.5.bb |    7 +++++++
 1 file changed, 7 insertions(+)
meta/recipes-connectivity/bind/bind_9.9.5.bb +7 -0
index ebd38ef..dd171c1 100644
@@ -51,6 +51,13 @@ FILES_${PN}-utils = "${bindir}/host ${bindir}/dig"
 FILES_${PN}-dev += "${bindir}/isc-config.h"
 FILES_${PN} += "${sbindir}/generate-rndc-key.sh"
 
+do_install_prepend() {
+	# clean host path in isc-config.sh before the hardlink created
+	# by "make install":
+	#   bind9-config -> isc-config.sh
+	sed -i -e "s,${STAGING_LIBDIR},${libdir}," ${S}/isc-config.sh
+}
+
 do_install_append() {
 	rm "${D}${bindir}/nslookup"
 	rm "${D}${mandir}/man1/nslookup.1"
Signature · 1 line
1.7.9.5
author
#4 lore raw

PATCH v2 4/4 tcl: clean host path in tclConfig.sh

In reply to [email protected]

From: Shiqun Lin <[email protected]>

* /usr/bin/crossscripts/tclConfig.sh

Signed-off-by Shiqun Lin <[email protected]>
Signed-off-by Wenzong Fan <[email protected]>
---
 meta/recipes-devtools/tcltk/tcl_8.6.2.bb |    5 +++++
 1 file changed, 5 insertions(+)
meta/recipes-devtools/tcltk/tcl_8.6.2.bb +5 -0
index 75fef01..34f3e87 100644
@@ -58,6 +58,11 @@ do_install() {
 	sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tclConfig.sh
 	sed -i "s,-L${libdir},-L=${libdir},g" tclConfig.sh
 	sed -i "s,-I${includedir},-I=${includedir},g" tclConfig.sh
+	sed -i "/TCL_CC/s,\(--sysroot=\).*,--sysroot= '," tclConfig.sh
+	sed -i "/TCL_BUILD_LIB_SPEC/s,-L${STAGING_LIBDIR},-L${libdir}," tclConfig.sh
+	sed -i "/TCL_SRC_DIR/s,${STAGING_INCDIR},${includedir}," tclConfig.sh
+	sed -i "/TCL_BUILD_STUB_LIB_SPEC/s,-L${STAGING_LIBDIR},-L${libdir}," tclConfig.sh
+	sed -i "/TCL_BUILD_STUB_LIB_PATH/s,${STAGING_INCDIR},${includedir}," tclConfig.sh
 	install -d ${D}${bindir_crossscripts}
 	install -m 0755 tclConfig.sh ${D}${bindir_crossscripts}
 	install -m 0755 tclConfig.sh ${D}${libdir}
Signature · 1 line
1.7.9.5
author
#5 lore raw

Re: [PATCH v2 4/4] tcl: clean host path in tclConfig.sh

Oops, the tcl patch will cause "expect 5.45" configure failures, please ignore it for now.

// Wenzong

Quoted 27 lines · On 11/14/2014 05:44 PM, [email protected] wrote:

From: Shiqun Lin <[email protected]>

* /usr/bin/crossscripts/tclConfig.sh

Signed-off-by Shiqun Lin <[email protected]>
Signed-off-by Wenzong Fan <[email protected]>
---
  meta/recipes-devtools/tcltk/tcl_8.6.2.bb |    5 +++++
  1 file changed, 5 insertions(+)
meta/recipes-devtools/tcltk/tcl_8.6.2.bb +5 -0
index 75fef01..34f3e87 100644
@@ -58,6 +58,11 @@ do_install() {
  	sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tclConfig.sh
  	sed -i "s,-L${libdir},-L=${libdir},g" tclConfig.sh
  	sed -i "s,-I${includedir},-I=${includedir},g" tclConfig.sh
+	sed -i "/TCL_CC/s,\(--sysroot=\).*,--sysroot= '," tclConfig.sh
+	sed -i "/TCL_BUILD_LIB_SPEC/s,-L${STAGING_LIBDIR},-L${libdir}," tclConfig.sh
+	sed -i "/TCL_SRC_DIR/s,${STAGING_INCDIR},${includedir}," tclConfig.sh
+	sed -i "/TCL_BUILD_STUB_LIB_SPEC/s,-L${STAGING_LIBDIR},-L${libdir}," tclConfig.sh
+	sed -i "/TCL_BUILD_STUB_LIB_PATH/s,${STAGING_INCDIR},${includedir}," tclConfig.sh
  	install -d ${D}${bindir_crossscripts}
  	install -m 0755 tclConfig.sh ${D}${bindir_crossscripts}
  	install -m 0755 tclConfig.sh ${D}${libdir}