On 2017年02月21日 21:45, Burton, Ross wrote:
Having commits which don't build isn't good for bisecting in the
future: can you squash these into a single commit and credit Zheng
Ruoqin for the initial work?
OK, I will squash them into a single commit.
//Hongxu
Ross
On 21 February 2017 at 07:36, Hongxu Jia <hongxu....@windriver.com
<mailto:hongxu....@windriver.com>> wrote:
- Update patches from upstream to 4.4
- Add ${PN}-loadable for loadable builtins which is new features
in Bash 4.4
--------------
a. `make install' now installs the example loadable builtins
and a set of
bash headers to use when developing new loadable builtins.
b. `enable -f' now attempts to call functions named
BUILTIN_builtin_load when
loading BUILTIN, and BUILTIN_builtin_unload when deleting
it. This allows
loadable builtins to run initialization and cleanup code.
c. There is a new BASH_LOADABLES_PATH variable containing a
list of directories
where the `enable -f' command looks for shared objects
containing loadable
builtins.
--------------
- The loadable builtins `uname' could not be parsed by rpmdeps
correctly:
--------------
$ recipe-sysroot-native/usr/lib/rpm/bin/rpmdeps-oecore --macros \
recipe-sysroot-native/usr/lib/rpm/macros --define
'_rpmfc_magic_path \
recipe-sysroot-native/usr/share/misc/magic.mgc' --rpmpopt \
recipe-sysroot-native/usr/lib/rpm/rpmpopt
packages-split/bash/usr/lib64/bash/uname
|packages-split/bash/usr/lib64/bash/uname Provides: )(64bit
|packages-split/bash/usr/lib64/bash/uname Provides:
elf(buildid) = 7186059a5a6b11ec38493b53072c3a62edf7e05c
--------------
The incorrected "Provides: )(64bit" could not be parsed by
rpmbuild.
--------------
| DEBUG: Executing shell function BUILDSPEC
| error: line 56: Dependency ")(64bit" must begin with
alpha-numeric, '_' or '/': Provides: )(64bit
| error: Package has no %description: bash-4.4-r0.core2_64
--------------
Signed-off-by: Hongxu Jia <hongxu....@windriver.com
<mailto:hongxu....@windriver.com>>
---
...e-builtins-uname-could-not-be-parsed-by-r.patch | 89
++++++++++++++++++++++
meta/recipes-extended/bash/bash_4.4.bb <http://bash_4.4.bb>
| 28 +++++++
2 files changed, 117 insertions(+)
create mode 100644
meta/recipes-extended/bash/bash/0001-The-loadable-builtins-uname-could-not-be-parsed-by-r.patch
diff --git
a/meta/recipes-extended/bash/bash/0001-The-loadable-builtins-uname-could-not-be-parsed-by-r.patch
b/meta/recipes-extended/bash/bash/0001-The-loadable-builtins-uname-could-not-be-parsed-by-r.patch
new file mode 100644
index 0000000..79d9e4e
--- /dev/null
+++
b/meta/recipes-extended/bash/bash/0001-The-loadable-builtins-uname-could-not-be-parsed-by-r.patch
@@ -0,0 +1,89 @@
+rename uname to workaround name confliction in rpmnsProbe
+
+The loadable builtins `uname' could not be parsed by
+rpmdeps correctly:
+--------------
+$recipe-sysroot-native/usr/lib/rpm/bin/rpmdeps-oecore --macros \
+recipe-sysroot-native/usr/lib/rpm/macros --define
'_rpmfc_magic_path \
+recipe-sysroot-native/usr/share/misc/magic.mgc' --rpmpopt \
+recipe-sysroot-native/usr/lib/rpm/rpmpopt
packages-split/bash/usr/lib64/bash/uname
+
+|packages-split/bash/usr/lib64/bash/uname Provides: )(64bit
+|packages-split/bash/usr/lib64/bash/uname Provides: elf(buildid)
= 7186059a5a6b11ec38493b53072c3a62edf7e05c
+--------------
+
+The incorrected "Provides: )(64bit" could not be parsed by rpmbuild.
+--------------
+| DEBUG: Executing shell function BUILDSPEC
+| error: line 56: Dependency ")(64bit" must begin with
alpha-numeric, '_' or '/': Provides: )(64bit
+| error: Package has no %description: bash-4.4-r0.core2_64
+--------------
+
+The root cause is `uname' is incorrectly parsed by rpmnsProbe
that string
+matches with "uname()(64bit)".
+
+The nsType of `uname' should be RPMNS_TYPE_NAMESPACE (like other
utilities),
+rather than RPMNS_TYPE_UNAME which generates "Provides: )(64bit".
+
+We could not fix rpm-native without side effect. So rename to
`uname-oe'
+and create a symlink `uname' could workaround the issue.
+
+Here is to load builtin uname in the target:
+----------------
+root@qemux86-64:# enable -f /usr/lib64/bash/uname uname
+root@qemux86-64:# help uname
+uname: uname [-amnrsv]
+ Display system information.
+
+ Display information about the system hardware and OS.
+----------------
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Hongxu Jia <hongxu....@windriver.com
<mailto:hongxu....@windriver.com>>
+---
+ examples/loadables/Makefile.in | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/examples/loadables/Makefile.in
b/examples/loadables/Makefile.in
+index ec305cd..c7c96e2 100644
+--- a/examples/loadables/Makefile.in
++++ b/examples/loadables/Makefile.in
+@@ -102,7 +102,7 @@ INC = -I. -I.. -I$(topdir) -I$(topdir)/lib
-I$(topdir)/builtins -I${srcdir} \
+
+ ALLPROG = print truefalse sleep finfo logname basename dirname \
+ tty pathchk tee head mkdir rmdir printenv id whoami \
+- uname sync push ln unlink realpath strftime mypid setpgid
++ uname-oe sync push ln unlink realpath strftime mypid setpgid
+ OTHERPROG = necho hello cat pushd
+
+ all: $(SHOBJ_STATUS)
+@@ -178,7 +178,7 @@ id: id.o
+ whoami: whoami.o
+ $(SHOBJ_LD) $(SHOBJ_LDFLAGS) $(SHOBJ_XLDFLAGS) -o $@
whoami.o $(SHOBJ_LIBS)
+
+-uname: uname.o
++uname-oe: uname.o
+ $(SHOBJ_LD) $(SHOBJ_LDFLAGS) $(SHOBJ_XLDFLAGS) -o $@
uname.o $(SHOBJ_LIBS)
+
+ sync: sync.o
+@@ -244,13 +244,15 @@ install-supported: all installdirs
install-dev
+ echo $$prog ; \
+ $(INSTALL_PROGRAM) $(INSTALLMODE) $$prog
$(DESTDIR)$(loadablesdir)/$$prog ;\
+ done
++ -( cd $(DESTDIR)$(loadablesdir) && ln -snf uname-oe uname)
++
+
+ uninstall-dev:
+ -$(RM) $(DESTDIR)$(loadablesdir)/Makefile.inc
+ -( cd $(BUILD_DIR) && ${MAKE} ${MFLAGS}
DESTDIR="$(DESTDIR)" uninstall-headers)
+
+ uninstall-supported: uninstall-dev
+- -( cd $(DESTDIR)${loadablesdir} && $(RM) ${ALLPROG} )
++ -( cd $(DESTDIR)${loadablesdir} && $(RM) ${ALLPROG} uname)
+
+ install-unsupported:
+ uninstall-unsupported:
+--
+2.8.1
+
diff --git a/meta/recipes-extended/bash/bash_4.4.bb
<http://bash_4.4.bb> b/meta/recipes-extended/bash/bash_4.4.bb
<http://bash_4.4.bb>
index 16ff114..798bfdb 100644
--- a/meta/recipes-extended/bash/bash_4.4.bb <http://bash_4.4.bb>
+++ b/meta/recipes-extended/bash/bash_4.4.bb <http://bash_4.4.bb>
@@ -10,6 +10,13 @@ SRC_URI =
"${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \
${GNU_MIRROR}/bash/bash-4.4-patches/bash44-003;apply=yes;striplevel=0;name=patch003
\
${GNU_MIRROR}/bash/bash-4.4-patches/bash44-004;apply=yes;striplevel=0;name=patch004
\
${GNU_MIRROR}/bash/bash-4.4-patches/bash44-005;apply=yes;striplevel=0;name=patch005
\
+
${GNU_MIRROR}/bash/bash-4.4-patches/bash44-006;apply=yes;striplevel=0;name=patch006
\
+
${GNU_MIRROR}/bash/bash-4.4-patches/bash44-007;apply=yes;striplevel=0;name=patch007
\
+
${GNU_MIRROR}/bash/bash-4.4-patches/bash44-008;apply=yes;striplevel=0;name=patch008
\
+
${GNU_MIRROR}/bash/bash-4.4-patches/bash44-009;apply=yes;striplevel=0;name=patch009
\
+
${GNU_MIRROR}/bash/bash-4.4-patches/bash44-010;apply=yes;striplevel=0;name=patch010
\
+
${GNU_MIRROR}/bash/bash-4.4-patches/bash44-011;apply=yes;striplevel=0;name=patch011
\
+
${GNU_MIRROR}/bash/bash-4.4-patches/bash44-012;apply=yes;striplevel=0;name=patch012
\
file://execute_cmd.patch;striplevel=0 \
file://mkbuiltins_have_stringize.patch \
file://build-tests.patch \
@@ -19,6 +26,7 @@ SRC_URI =
"${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \
file://fix-run-builtins.patch \
file://0001-help-fix-printf-format-security-warning.patch \
file://0001-patch-to-obtain-pkgconfig-sanity.patch \
+
file://0001-The-loadable-builtins-uname-could-not-be-parsed-by-r.patch
\
"
SRC_URI[tarball.md5sum] = "148888a7c95ac23705559b6f477dfe25"
@@ -34,5 +42,25 @@ SRC_URI[patch004.md5sum] =
"4557d674ab5831a5fa98052ab19edaf4"
SRC_URI[patch004.sha256sum] =
"ad080a30a4ac6c1273373617f29628cc320a35c8cd06913894794293dc52c8b3"
SRC_URI[patch005.md5sum] = "cce96dd77cdd1d293beec10848f6cbb5"
SRC_URI[patch005.sha256sum] =
"221e4b725b770ad0bb6924df3f8d04f89eeca4558f6e4c777dfa93e967090529"
+SRC_URI[patch006.md5sum] = "d3379f8d8abce5c6ee338f931ad008d5"
+SRC_URI[patch006.sha256sum] =
"6a8e2e2a6180d0f1ce39dcd651622fb6d2fd05db7c459f64ae42d667f1e344b8"
+SRC_URI[patch007.md5sum] = "ec38c76ca439ca7f9c178e9baede84fc"
+SRC_URI[patch007.sha256sum] =
"de1ccc07b7bfc9e25243ad854f3bbb5d3ebf9155b0477df16aaf00a7b0d5edaf"
+SRC_URI[patch008.md5sum] = "e0ba18c1e3b94f905da9b5bf9d38b58b"
+SRC_URI[patch008.sha256sum] =
"86144700465933636d7b945e89b77df95d3620034725be161ca0ca5a42e239ba"
+SRC_URI[patch009.md5sum] = "e952d4f44e612048930c559d90eb99bb"
+SRC_URI[patch009.sha256sum] =
"0b6bdd1a18a0d20e330cc3bc71e048864e4a13652e29dc0ebf3918bea729343c"
+SRC_URI[patch010.md5sum] = "57b5b35955d68f9a09dbef6b86d2c782"
+SRC_URI[patch010.sha256sum] =
"8465c6f2c56afe559402265b39d9e94368954930f9aa7f3dfa6d36dd66868e06"
+SRC_URI[patch011.md5sum] = "cc896e1fa696b93ded568e557e2392d5"
+SRC_URI[patch011.sha256sum] =
"dd56426ef7d7295e1107c0b3d06c192eb9298f4023c202ca2ba6266c613d170d"
+SRC_URI[patch012.md5sum] = "fa47fbfa56fb7e9e5367f19a9df5fc9e"
+SRC_URI[patch012.sha256sum] =
"fac271d2bf6372c9903e3b353cb9eda044d7fe36b5aab52f21f3f21cd6a2063e"
BBCLASSEXTEND = "nativesdk"
+
+PACKAGE_BEFORE_PN += "${PN}-loadable"
+RDEPENDS_${PN}-loadable += "${PN}"
+FILES_${PN}-dev += "${libdir}/bash/Makefile.inc"
+FILES_${PN}-loadable += "${libdir}/bash/*"
+
--
2.9.3
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
