* [PATCH v2 0/4] Clean host path in target scripts
@ 2014-11-14 9:44 wenzong.fan
2014-11-14 9:44 ` [PATCH v2 1/4] bash: clean host path in bashbug wenzong.fan
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: wenzong.fan @ 2014-11-14 9:44 UTC (permalink / raw)
To: openembedded-core
From: Wenzong Fan <wenzong.fan@windriver.com>
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(+)
--
1.7.9.5
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH v2 1/4] bash: clean host path in bashbug 2014-11-14 9:44 [PATCH v2 0/4] Clean host path in target scripts wenzong.fan @ 2014-11-14 9:44 ` wenzong.fan 2014-11-14 9:44 ` [PATCH v2 2/4] e2fsprogs: clean host path in compile_et, mk_cmds wenzong.fan ` (2 subsequent siblings) 3 siblings, 0 replies; 6+ messages in thread From: wenzong.fan @ 2014-11-14 9:44 UTC (permalink / raw) To: openembedded-core From: Shiqun Lin <Shiqun.Lin@windriver.com> * /usr/bin/bashbug Signed-off-by: Shiqun Lin <Shiqun.Lin@windriver.com> 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 v2 2/4] e2fsprogs: clean host path in compile_et, mk_cmds 2014-11-14 9:44 [PATCH v2 0/4] Clean host path in target scripts wenzong.fan 2014-11-14 9:44 ` [PATCH v2 1/4] bash: clean host path in bashbug wenzong.fan @ 2014-11-14 9:44 ` wenzong.fan 2014-11-14 9:44 ` [PATCH v2 3/4] bind: clean host path in isc-config.sh wenzong.fan 2014-11-14 9:44 ` [PATCH v2 4/4] tcl: clean host path in tclConfig.sh wenzong.fan 3 siblings, 0 replies; 6+ messages in thread From: wenzong.fan @ 2014-11-14 9:44 UTC (permalink / raw) To: openembedded-core From: Shiqun Lin <Shiqun.Lin@windriver.com> * /usr/bin/compile_et * /usr/bin/mk_cmds Signed-off-by: Shiqun Lin <Shiqun.Lin@windriver.com> 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..1fb4a6cd 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,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" -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 3/4] bind: clean host path in isc-config.sh 2014-11-14 9:44 [PATCH v2 0/4] Clean host path in target scripts wenzong.fan 2014-11-14 9:44 ` [PATCH v2 1/4] bash: clean host path in bashbug wenzong.fan 2014-11-14 9:44 ` [PATCH v2 2/4] e2fsprogs: clean host path in compile_et, mk_cmds wenzong.fan @ 2014-11-14 9:44 ` wenzong.fan 2014-11-14 9:44 ` [PATCH v2 4/4] tcl: clean host path in tclConfig.sh wenzong.fan 3 siblings, 0 replies; 6+ messages in thread From: wenzong.fan @ 2014-11-14 9:44 UTC (permalink / raw) To: openembedded-core From: Shiqun Lin <Shiqun.Lin@windriver.com> * /usr/bin/isc-config.sh * /usr/bin/bind9-config - hardlink to isc-config.sh Signed-off-by: Shiqun Lin <Shiqun.Lin@windriver.com> 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 v2 4/4] tcl: clean host path in tclConfig.sh 2014-11-14 9:44 [PATCH v2 0/4] Clean host path in target scripts wenzong.fan ` (2 preceding siblings ...) 2014-11-14 9:44 ` [PATCH v2 3/4] bind: clean host path in isc-config.sh wenzong.fan @ 2014-11-14 9:44 ` wenzong.fan 2014-11-17 2:08 ` wenzong fan 3 siblings, 1 reply; 6+ messages in thread From: wenzong.fan @ 2014-11-14 9:44 UTC (permalink / raw) To: openembedded-core From: Shiqun Lin <Shiqun.Lin@windriver.com> * /usr/bin/crossscripts/tclConfig.sh Signed-off-by: Shiqun Lin <Shiqun.Lin@windriver.com> Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> --- meta/recipes-devtools/tcltk/tcl_8.6.2.bb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.2.bb b/meta/recipes-devtools/tcltk/tcl_8.6.2.bb index 75fef01..34f3e87 100644 --- a/meta/recipes-devtools/tcltk/tcl_8.6.2.bb +++ b/meta/recipes-devtools/tcltk/tcl_8.6.2.bb @@ -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} -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 4/4] tcl: clean host path in tclConfig.sh 2014-11-14 9:44 ` [PATCH v2 4/4] tcl: clean host path in tclConfig.sh wenzong.fan @ 2014-11-17 2:08 ` wenzong fan 0 siblings, 0 replies; 6+ messages in thread From: wenzong fan @ 2014-11-17 2:08 UTC (permalink / raw) To: openembedded-core Oops, the tcl patch will cause "expect 5.45" configure failures, please ignore it for now. // Wenzong On 11/14/2014 05:44 PM, wenzong.fan@windriver.com wrote: > From: Shiqun Lin <Shiqun.Lin@windriver.com> > > * /usr/bin/crossscripts/tclConfig.sh > > Signed-off-by: Shiqun Lin <Shiqun.Lin@windriver.com> > Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> > --- > meta/recipes-devtools/tcltk/tcl_8.6.2.bb | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.2.bb b/meta/recipes-devtools/tcltk/tcl_8.6.2.bb > index 75fef01..34f3e87 100644 > --- a/meta/recipes-devtools/tcltk/tcl_8.6.2.bb > +++ b/meta/recipes-devtools/tcltk/tcl_8.6.2.bb > @@ -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} > ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-11-17 2:08 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-11-14 9:44 [PATCH v2 0/4] Clean host path in target scripts wenzong.fan 2014-11-14 9:44 ` [PATCH v2 1/4] bash: clean host path in bashbug wenzong.fan 2014-11-14 9:44 ` [PATCH v2 2/4] e2fsprogs: clean host path in compile_et, mk_cmds wenzong.fan 2014-11-14 9:44 ` [PATCH v2 3/4] bind: clean host path in isc-config.sh wenzong.fan 2014-11-14 9:44 ` [PATCH v2 4/4] tcl: clean host path in tclConfig.sh wenzong.fan 2014-11-17 2:08 ` wenzong fan
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox