* [PATCH 1/4] bash: clean host path in bashbug
2014-10-22 1:46 [PATCH 0/4] Clean host path in target scripts wenzong.fan
@ 2014-10-22 1:46 ` wenzong.fan
2014-10-22 1:46 ` [PATCH 2/4] e2fsprogs: clean host path in compile_et, mk_cmds wenzong.fan
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: wenzong.fan @ 2014-10-22 1:46 UTC (permalink / raw)
To: openembedded-core
From: Wenzong Fan <wenzong.fan@windriver.com>
* /usr/bin/bashbug
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
---
meta/recipes-extended/bash/bash.inc | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc
index 2fe0c6b..d35d25c 100644
--- a/meta/recipes-extended/bash/bash.inc
+++ b/meta/recipes-extended/bash/bash.inc
@@ -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
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/4] e2fsprogs: clean host path in compile_et, mk_cmds
2014-10-22 1:46 [PATCH 0/4] Clean host path in target scripts wenzong.fan
2014-10-22 1:46 ` [PATCH 1/4] bash: clean host path in bashbug wenzong.fan
@ 2014-10-22 1:46 ` wenzong.fan
2014-10-22 1:46 ` [PATCH 3/4] bind: clean host path in isc-config.sh wenzong.fan
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: wenzong.fan @ 2014-10-22 1:46 UTC (permalink / raw)
To: openembedded-core
From: Wenzong Fan <wenzong.fan@windriver.com>
* /usr/bin/compile_et
* /usr/bin/mk_cmds
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
---
.../recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
index f89e5ac..ecc838b 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
@@ -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"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/4] bind: clean host path in isc-config.sh
2014-10-22 1:46 [PATCH 0/4] Clean host path in target scripts wenzong.fan
2014-10-22 1:46 ` [PATCH 1/4] bash: clean host path in bashbug wenzong.fan
2014-10-22 1:46 ` [PATCH 2/4] e2fsprogs: clean host path in compile_et, mk_cmds wenzong.fan
@ 2014-10-22 1:46 ` wenzong.fan
2014-10-22 1:46 ` [PATCH 4/4] tcl: clean host path in tclConfig.sh wenzong.fan
2014-10-24 9:18 ` [PATCH 0/4] Clean host path in target scripts wenzong fan
4 siblings, 0 replies; 6+ messages in thread
From: wenzong.fan @ 2014-10-22 1:46 UTC (permalink / raw)
To: openembedded-core
From: Wenzong Fan <wenzong.fan@windriver.com>
* /usr/bin/isc-config.sh
* /usr/bin/bind9-config - hardlink to isc-config.sh
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
---
meta/recipes-connectivity/bind/bind_9.9.5.bb | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/meta/recipes-connectivity/bind/bind_9.9.5.bb b/meta/recipes-connectivity/bind/bind_9.9.5.bb
index ebd38ef..dd171c1 100644
--- a/meta/recipes-connectivity/bind/bind_9.9.5.bb
+++ b/meta/recipes-connectivity/bind/bind_9.9.5.bb
@@ -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"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 4/4] tcl: clean host path in tclConfig.sh
2014-10-22 1:46 [PATCH 0/4] Clean host path in target scripts wenzong.fan
` (2 preceding siblings ...)
2014-10-22 1:46 ` [PATCH 3/4] bind: clean host path in isc-config.sh wenzong.fan
@ 2014-10-22 1:46 ` wenzong.fan
2014-10-24 9:18 ` [PATCH 0/4] Clean host path in target scripts wenzong fan
4 siblings, 0 replies; 6+ messages in thread
From: wenzong.fan @ 2014-10-22 1:46 UTC (permalink / raw)
To: openembedded-core
From: Wenzong Fan <wenzong.fan@windriver.com>
* /usr/bin/crossscripts/tclConfig.sh
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
---
meta/recipes-devtools/tcltk/tcl_8.6.1.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.1.bb b/meta/recipes-devtools/tcltk/tcl_8.6.1.bb
index 27f73f2..6c2c642 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.6.1.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.6.1.bb
@@ -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}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 0/4] Clean host path in target scripts
2014-10-22 1:46 [PATCH 0/4] Clean host path in target scripts wenzong.fan
` (3 preceding siblings ...)
2014-10-22 1:46 ` [PATCH 4/4] tcl: clean host path in tclConfig.sh wenzong.fan
@ 2014-10-24 9:18 ` wenzong fan
4 siblings, 0 replies; 6+ messages in thread
From: wenzong fan @ 2014-10-24 9:18 UTC (permalink / raw)
To: openembedded-core
Drop the patches - Mistaken Signatures.
Wenzong
On 10/22/2014 09:46 AM, wenzong.fan@windriver.com wrote:
> From: Wenzong Fan <wenzong.fan@windriver.com>
>
> 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(+)
>
^ permalink raw reply [flat|nested] 6+ messages in thread