Skip to contentSkip to conversation

Clean host path in target scripts

PATCH Superseded [email protected] 1 participant 6 messages Oct 22, 2014 – Oct 24, 2014

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

[email protected]

author
#0 lore raw

cover Clean host path in target scripts

From: Wenzong Fan <[email protected]>

Clean host path for:

* /usr/bin/crossscripts/tclConfig.sh
* /usr/bin/isc-config.sh
* /usr/bin/bind9-config - hardlink to isc-config.sh
* /usr/bin/compile_et
* /usr/bin/mk_cmds
* /usr/bin/bashbug

The following changes since commit 924da20c6f2f183fa7e930e4c3c6b14c090acbe5:

build-appliance-image: Update to dizzy head revision (2014-10-18 16:16:38 +0200)

are available in the git repository at:

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

Wenzong Fan (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.1.bb           |    1 +
 meta/recipes-extended/bash/bash.inc                |    4 ++++
 4 files changed, 18 insertions(+)
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH 1/4 bash: clean host path in bashbug

From: Wenzong Fan <[email protected]>

* /usr/bin/bashbug

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 2/4 e2fsprogs: clean host path in compile_et, mk_cmds

In reply to [email protected]

From: Wenzong Fan <[email protected]>

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

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..ecc838b 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,${S}/lib/et,,g" ${D}${bindir}/compile_et
+	sed -i -e "s,${S}/lib/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 3/4 bind: clean host path in isc-config.sh

In reply to [email protected]

From: Wenzong Fan <[email protected]>

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

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 4/4 tcl: clean host path in tclConfig.sh

In reply to [email protected]

From: Wenzong Fan <[email protected]>

* /usr/bin/crossscripts/tclConfig.sh

Signed-off-by Wenzong Fan <[email protected]>
---
 meta/recipes-devtools/tcltk/tcl_8.6.1.bb |    1 +
 1 file changed, 1 insertion(+)
meta/recipes-devtools/tcltk/tcl_8.6.1.bb +1 -0
index 27f73f2..6c2c642 100644
@@ -58,6 +58,7 @@ 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
 	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
In reply to [email protected]

Drop the patches - Mistaken Signatures.

Wenzong

Quoted 32 lines · On 10/22/2014 09:46 AM, [email protected] wrote:

From: Wenzong Fan <[email protected]>

Clean host path for:

* /usr/bin/crossscripts/tclConfig.sh
* /usr/bin/isc-config.sh
* /usr/bin/bind9-config - hardlink to isc-config.sh
* /usr/bin/compile_et
* /usr/bin/mk_cmds
* /usr/bin/bashbug

The following changes since commit 924da20c6f2f183fa7e930e4c3c6b14c090acbe5:

   build-appliance-image: Update to dizzy head revision (2014-10-18 16:16:38 +0200)

are available in the git repository at:

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

Wenzong Fan (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.1.bb           |    1 +
  meta/recipes-extended/bash/bash.inc                |    4 ++++
  4 files changed, 18 insertions(+)