summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/buildhistory.bbclass2
-rw-r--r--meta/classes/license.bbclass2
-rw-r--r--meta/lib/oe/package_manager.py2
-rw-r--r--meta/lib/oeqa/runtime/_ptest.py2
4 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index 90cfe4f954..211dcf18b5 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -374,7 +374,7 @@ buildhistory_get_installed() {
374 printf "" > $1/installed-package-sizes.tmp 374 printf "" > $1/installed-package-sizes.tmp
375 cat $pkgcache | while read pkg pkgfile pkgarch 375 cat $pkgcache | while read pkg pkgfile pkgarch
376 do 376 do
377 size=`oe-pkgdata-util read-value ${PKGDATA_DIR} "PKGSIZE" ${pkg}_${pkgarch}` 377 size=`oe-pkgdata-util -p ${PKGDATA_DIR} read-value "PKGSIZE" ${pkg}_${pkgarch}`
378 if [ "$size" != "" ] ; then 378 if [ "$size" != "" ] ; then
379 echo "$size $pkg" >> $1/installed-package-sizes.tmp 379 echo "$size $pkg" >> $1/installed-package-sizes.tmp
380 fi 380 fi
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 21465d8d00..13c1a0fddf 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -80,7 +80,7 @@ license_create_manifest() {
80 if [ "${COPY_LIC_DIRS}" = "1" ]; then 80 if [ "${COPY_LIC_DIRS}" = "1" ]; then
81 for pkg in ${INSTALLED_PKGS}; do 81 for pkg in ${INSTALLED_PKGS}; do
82 mkdir -p ${IMAGE_ROOTFS}/usr/share/common-licenses/${pkg} 82 mkdir -p ${IMAGE_ROOTFS}/usr/share/common-licenses/${pkg}
83 pkged_pn="$(oe-pkgdata-util lookup-recipe ${PKGDATA_DIR} ${pkg})" 83 pkged_pn="$(oe-pkgdata-util -p ${PKGDATA_DIR} lookup-recipe ${pkg})"
84 for lic in `ls ${LICENSE_DIRECTORY}/${pkged_pn}`; do 84 for lic in `ls ${LICENSE_DIRECTORY}/${pkged_pn}`; do
85 # Really don't need to copy the generics as they're 85 # Really don't need to copy the generics as they're
86 # represented in the manifest and in the actual pkg licenses 86 # represented in the manifest and in the actual pkg licenses
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 6f49c69110..fcf05dc282 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -529,7 +529,7 @@ class PackageManager(object):
529 return 529 return
530 530
531 cmd = [bb.utils.which(os.getenv('PATH'), "oe-pkgdata-util"), 531 cmd = [bb.utils.which(os.getenv('PATH'), "oe-pkgdata-util"),
532 "glob", self.d.getVar('PKGDATA_DIR', True), installed_pkgs_file, 532 "-p", self.d.getVar('PKGDATA_DIR', True), "glob", installed_pkgs_file,
533 globs] 533 globs]
534 try: 534 try:
535 bb.note("Installing complementary packages ...") 535 bb.note("Installing complementary packages ...")
diff --git a/meta/lib/oeqa/runtime/_ptest.py b/meta/lib/oeqa/runtime/_ptest.py
index 4c58dc1d7f..53b0807c4a 100644
--- a/meta/lib/oeqa/runtime/_ptest.py
+++ b/meta/lib/oeqa/runtime/_ptest.py
@@ -86,7 +86,7 @@ class PtestRunnerTest(oeRuntimeTest):
86 installed_pkgs.write(self.pkgs_list.list("arch")) 86 installed_pkgs.write(self.pkgs_list.list("arch"))
87 87
88 cmd = [bb.utils.which(os.getenv('PATH'), "oe-pkgdata-util"), 88 cmd = [bb.utils.which(os.getenv('PATH'), "oe-pkgdata-util"),
89 "glob", oeRuntimeTest.tc.d.getVar('PKGDATA_DIR', True), installed_pkgs_file, 89 "-p", oeRuntimeTest.tc.d.getVar('PKGDATA_DIR', True), "glob", installed_pkgs_file,
90 globs] 90 globs]
91 try: 91 try:
92 bb.note("Installing complementary packages ...") 92 bb.note("Installing complementary packages ...")