Skip to contentSkip to conversation

fix rdepends for main pkgs

PATCH New Robert Yang 1 participant 8 messages Aug 18, 2014

lore
Share & tools
lore
#0 lore raw

cover fix rdepends for main pkgs

These patches fix the rdepends for the main (which means not -dev or -misc) pkgs, it may affect the size of the image when you use ipk or deb, but has no impact on rpm, for example, if you install xmlto to image, bash will also be installed for package_ipk and package_deb now (package_rpm will always install it).

I think that we do need these fixes to make the ipk/deb work well, feel free to let me know if we need split any of the files in to a package, for example, split perl scripts into pn-misc package, and let pn-misc rdepend on perl to avoid affecting the main package.

// Robert

The following changes since commit d0be4b37743492fc9c178fd6f9ef73a5eb2fd9c3:

chrpath: Drop warning from darwn builds (2014-08-17 10:01:30 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib rbt/main
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/main

Robert Yang (7):
bitbake.conf: add bash-native to ASSUME_PROVIDED
libtool: add bash to RDEPENDS_libtool
pax-utils: add bash to RDEPENDS_pax-utils
kconfig-frontends: add bash to RDEPENDS_kconfig-frontends
xmlto: add bash to RDEPENDS_xmlto
apt: add bash to RDEPENDS_apt
pm-utils: add bash to RDEPENDS_pm-utils

 meta/conf/bitbake.conf                             |    3 ++-
 meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb        |    2 +-
 meta/recipes-devtools/apt/apt_0.9.9.4.bb           |    2 +-
 .../kconfig-frontends_3.12.0.0.bb                  |    2 +-
 meta/recipes-devtools/libtool/libtool-2.4.2.inc    |    2 ++
 .../libtool/libtool-cross_2.4.2.bb                 |    2 --
 .../libtool/libtool-native_2.4.2.bb                |    2 --
 meta/recipes-devtools/libtool/libtool_2.4.2.bb     |    2 ++
 .../libtool/nativesdk-libtool_2.4.2.bb             |    2 --
 meta/recipes-devtools/pax-utils/pax-utils_0.8.1.bb |    2 ++
 meta/recipes-devtools/xmlto/xmlto_0.0.25.bb        |    3 ++-
 11 files changed, 13 insertions(+), 11 deletions(-)
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/7 bitbake.conf: add bash-native to ASSUME_PROVIDED

A few native scipts requires bash-native, and we don't build bash-native, so add it to ASSUME_PROVIDED.

---
 meta/conf/bitbake.conf |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta/conf/bitbake.conf +2 -1
index 5872d1d..afe8661 100644
@@ -169,7 +169,8 @@ ASSUME_PROVIDED = "\
     python-native-runtime \
     tar-native \
     virtual/libintl-native \
-    texinfo-native\
+    texinfo-native \
+    bash-native \
     "
 # gzip-native should be listed above?
 
Signature · 1 line
1.7.9.5
#2 lore raw

PATCH 2/7 libtool: add bash to RDEPENDS_libtool

In reply to Robert Yang

* Set CONFIG_SHELL="/bin/bash"
* Add bash to RDEPENDS_libtool

We had already set CONFIG_SHELL="/bin/bash" for libtool-native, libtool-cross and nativesdk-libtool, now also set for target libtool, if we don't set this, libtool would use /bin/sh, /bin/bash, /bin/ksh or /bin/sh5 according to the host, and the build is undetermined, this patch can fix the problem, libtool is a development tool, rdepends on bash should not cause toubles (for example, the size of the image)

Have tried to set CONFIG_SHELL="/bin/sh" (/bin/sh -> dash), but there is still a few bashsim in the output libtool.

---
 meta/recipes-devtools/libtool/libtool-2.4.2.inc    |    2 ++
 .../libtool/libtool-cross_2.4.2.bb                 |    2 --
 .../libtool/libtool-native_2.4.2.bb                |    2 --
 meta/recipes-devtools/libtool/libtool_2.4.2.bb     |    2 ++
 .../libtool/nativesdk-libtool_2.4.2.bb             |    2 --
 5 files changed, 4 insertions(+), 6 deletions(-)
meta/recipes-devtools/libtool/libtool-2.4.2.inc +2 -0
index 9c50d46..0f1964b 100644
@@ -49,3 +49,5 @@ FILES_libltdl = "${libdir}/libltdl${SOLIBS}"
 FILES_libltdl-dev = "${libdir}/libltdl${SOLIBSDEV} ${includedir}"
 FILES_libltdl-staticdev = "${libdir}/libltdl.a"
 FILES_libltdl-dbg = "${libdir}/.debug/"
+
+export CONFIG_SHELL="/bin/bash"
meta/recipes-devtools/libtool/libtool-cross_2.4.2.bb +0 -2
index 72fad37..34aae0b 100644
@@ -39,5 +39,3 @@ libtoolcross_sysroot_preprocess () {
 }
 
 SSTATE_SCAN_FILES += "libtoolize *-libtool"
-
-export CONFIG_SHELL="/bin/bash"
meta/recipes-devtools/libtool/libtool-native_2.4.2.bb +0 -2
index f1051d8..f03859e 100644
@@ -21,5 +21,3 @@ do_install () {
 	install -d ${D}${bindir}/
 	install -m 0755 ${HOST_SYS}-libtool ${D}${bindir}/${HOST_SYS}-libtool
 }
-
-export CONFIG_SHELL="/bin/bash"
meta/recipes-devtools/libtool/libtool_2.4.2.bb +2 -0
index a2eb4ea..d3f9428 100644
@@ -2,6 +2,8 @@ require libtool-${PV}.inc
 
 PR = "${INC_PR}.0"
 
+RDEPENDS_${PN} += "bash"
+
 #
 # We want the results of libtool-cross preserved - don't stage anything ourselves.
 #
meta/recipes-devtools/libtool/nativesdk-libtool_2.4.2.bb +0 -2
index fff15e9..7b5c97a 100644
@@ -31,5 +31,3 @@ libtoolnativesdk_sysroot_preprocess () {
 	install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/
 	install -m 755 ${D}${bindir}/${HOST_SYS}-libtool ${SYSROOT_DESTDIR}${bindir_crossscripts}/${HOST_SYS}-libtool
 }
-
-export CONFIG_SHELL="/bin/bash"
Signature · 1 line
1.7.9.5
#3 lore raw

PATCH 3/7 pax-utils: add bash to RDEPENDS_pax-utils

In reply to Robert Yang

Bash scripts:
pax-utils/usr/bin/symtree
pax-utils/usr/bin/lddtree

---
 meta/recipes-devtools/pax-utils/pax-utils_0.8.1.bb |    2 ++
 1 file changed, 2 insertions(+)
meta/recipes-devtools/pax-utils/pax-utils_0.8.1.bb +2 -0
index e79347f..79e58ba 100644
@@ -12,6 +12,8 @@ SRC_URI = "http://gentoo.osuosl.org/distfiles/pax-utils-${PV}.tar.xz"
 SRC_URI[md5sum] = "bc42279c5aff3682c12be40f72805cec"
 SRC_URI[sha256sum] = "844ff25b1a11bcef92ef34b22f576f226a772b67196818656f8874513438f5b9"
 
+RDEPENDS_${PN} += "bash"
+
 do_install() {
     oe_runmake PREFIX=${D}${prefix} DESTDIR=${D} install
 }
Signature · 1 line
1.7.9.5
#4 lore raw

PATCH 4/7 kconfig-frontends: add bash to RDEPENDS_kconfig-frontends

In reply to Robert Yang

Bash script:
kconfig-frontends/usr/bin/kconfig-tweak

---
 .../kconfig-frontends_3.12.0.0.bb                  |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.12.0.0.bb +1 -1
index 2f57527..ef0019f 100644
@@ -12,7 +12,7 @@ LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=9b8cf60ff39767ff04b671fca8302408"
 SECTION = "devel"
 DEPENDS += "ncurses flex bison gperf-native pkgconfig-native"
-RDEPENDS_${PN} += "python"
+RDEPENDS_${PN} += "python bash"
 SRC_URI = "http://ymorin.is-a-geek.org/download/${BPN}/${BP}.tar.xz"
 
 SRC_URI[md5sum] = "b939280dcc83f8feabd87a1d5f9b00c2"
Signature · 1 line
1.7.9.5
#5 lore raw

PATCH 5/7 xmlto: add bash to RDEPENDS_xmlto

In reply to Robert Yang

Bash scripts:
xmlto/usr/bin/xmlto.real

---
 meta/recipes-devtools/xmlto/xmlto_0.0.25.bb |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta/recipes-devtools/xmlto/xmlto_0.0.25.bb +2 -1
index 2747d6d..2698b1c 100644
@@ -15,11 +15,12 @@ SRC_URI[sha256sum] = "c52b56d929e8d20fc19cd3b7ec238f8d039730c56ee311cc352e843147
 
 inherit autotools
 
-# xmlto needs getopt/xmllint/xsltproc at runtime
+# xmlto needs getopt/xmllint/xsltproc/bash at runtime
 RDEPENDS_${PN} = "docbook-xml-dtd4 \
                   docbook-xsl-stylesheets \
                   util-linux \
                   libxml2 \
+                  bash \
 "
 RDEPENDS_${PN}_append_class-target = " \
                   libxslt-bin \
Signature · 1 line
1.7.9.5
#6 lore raw

PATCH 6/7 apt: add bash to RDEPENDS_apt

In reply to Robert Yang

Bash scripts:
apt/usr/lib64/dpkg/methods/apt/update
apt/usr/lib64/dpkg/methods/apt/install

---
 meta/recipes-devtools/apt/apt_0.9.9.4.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/apt/apt_0.9.9.4.bb +1 -1
index ae9ed6c..86ffe66 100644
@@ -1,5 +1,5 @@
 DEPENDS = "curl db"
-RDEPENDS_${PN} = "dpkg"
+RDEPENDS_${PN} = "dpkg bash"
 LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3"
 require apt.inc
 
Signature · 1 line
1.7.9.5
#7 lore raw

PATCH 7/7 pm-utils: add bash to RDEPENDS_pm-utils

In reply to Robert Yang

Bash script:
pm-utils/usr/lib64/pm-utils/sleep.d/98video-quirk-db-handler

---
 meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb +1 -1
index 21d2704..8d35187 100644
@@ -15,7 +15,7 @@ SRC_URI[sha256sum] = "8ed899032866d88b2933a1d34cc75e8ae42dcde20e1cc21836baaae3d4
 
 inherit pkgconfig autotools
 
-RDEPENDS_${PN} = "grep"
+RDEPENDS_${PN} = "grep bash"
 
 do_configure_prepend () {
 	( cd ${S}; autoreconf -f -i -s )
Signature · 1 line
1.7.9.5