diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-17 08:57:17 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-17 22:32:03 +0000 |
commit | 74938e387c19c7b72e1553d4148a58a5a3d1ceff (patch) | |
tree | af1fb5120dfdcd554942fbc34b56297fd183b71f /meta | |
parent | 069a332d1cf0778831673ed4ab5dfadbe2758783 (diff) | |
download | poky-74938e387c19c7b72e1553d4148a58a5a3d1ceff.tar.gz |
package_rpm/deb/ipk: Error if we don't find packages when creating the package index
If for whatever reason the package directory is empty of packages, it
makes sense to error early rather than later in what become much
more obtuse errors. This adds in a sanity check to each of the packaging
backends. It also removes the duplicate createrepo call since the
core index creation function now uses this directly after the switch
to smart.
(From OE-Core rev: 721ef058b37604e100021ec7a90ad2f745d83916)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/package_deb.bbclass | 7 | ||||
-rw-r--r-- | meta/classes/package_ipk.bbclass | 7 | ||||
-rw-r--r-- | meta/classes/package_rpm.bbclass | 9 |
3 files changed, 19 insertions, 4 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index 5740948c1a..f4b18c36d0 100644 --- a/meta/classes/package_deb.bbclass +++ b/meta/classes/package_deb.bbclass | |||
@@ -78,6 +78,7 @@ package_update_index_deb () { | |||
78 | fi | 78 | fi |
79 | done | 79 | done |
80 | 80 | ||
81 | found=0 | ||
81 | for arch in $debarchs; do | 82 | for arch in $debarchs; do |
82 | if [ ! -d ${DEPLOY_DIR_DEB}/$arch ]; then | 83 | if [ ! -d ${DEPLOY_DIR_DEB}/$arch ]; then |
83 | continue; | 84 | continue; |
@@ -85,7 +86,11 @@ package_update_index_deb () { | |||
85 | cd ${DEPLOY_DIR_DEB}/$arch | 86 | cd ${DEPLOY_DIR_DEB}/$arch |
86 | dpkg-scanpackages . | gzip > Packages.gz | 87 | dpkg-scanpackages . | gzip > Packages.gz |
87 | echo "Label: $arch" > Release | 88 | echo "Label: $arch" > Release |
89 | found=1 | ||
88 | done | 90 | done |
91 | if [ "$found" != "1" ]; then | ||
92 | bbfatal "There are no packages in ${DEPLOY_DIR_DEB}!" | ||
93 | fi | ||
89 | } | 94 | } |
90 | 95 | ||
91 | # | 96 | # |
@@ -457,6 +462,6 @@ do_package_write_deb[umask] = "022" | |||
457 | addtask package_write_deb before do_package_write after do_packagedata do_package | 462 | addtask package_write_deb before do_package_write after do_packagedata do_package |
458 | 463 | ||
459 | 464 | ||
460 | PACKAGEINDEXES += "package_update_index_deb;" | 465 | PACKAGEINDEXES += "[ ! -e ${DEPLOY_DIR_DEB} ] || package_update_index_deb;" |
461 | PACKAGEINDEXDEPS += "dpkg-native:do_populate_sysroot" | 466 | PACKAGEINDEXDEPS += "dpkg-native:do_populate_sysroot" |
462 | PACKAGEINDEXDEPS += "apt-native:do_populate_sysroot" | 467 | PACKAGEINDEXDEPS += "apt-native:do_populate_sysroot" |
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index e5e76ef278..526c3aecb1 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass | |||
@@ -216,12 +216,17 @@ package_update_index_ipk () { | |||
216 | packagedirs="$packagedirs ${DEPLOY_DIR_IPK}/$arch" | 216 | packagedirs="$packagedirs ${DEPLOY_DIR_IPK}/$arch" |
217 | done | 217 | done |
218 | 218 | ||
219 | found=0 | ||
219 | for pkgdir in $packagedirs; do | 220 | for pkgdir in $packagedirs; do |
220 | if [ -e $pkgdir/ ]; then | 221 | if [ -e $pkgdir/ ]; then |
222 | found=1 | ||
221 | touch $pkgdir/Packages | 223 | touch $pkgdir/Packages |
222 | flock $pkgdir/Packages.flock -c "opkg-make-index -r $pkgdir/Packages -p $pkgdir/Packages -m $pkgdir/" | 224 | flock $pkgdir/Packages.flock -c "opkg-make-index -r $pkgdir/Packages -p $pkgdir/Packages -m $pkgdir/" |
223 | fi | 225 | fi |
224 | done | 226 | done |
227 | if [ "$found" != "1" ]; then | ||
228 | bbfatal "There are no packages in ${DEPLOY_DIR_IPK}!" | ||
229 | fi | ||
225 | } | 230 | } |
226 | 231 | ||
227 | # | 232 | # |
@@ -483,6 +488,6 @@ do_package_write_ipk[cleandirs] = "${PKGWRITEDIRIPK}" | |||
483 | do_package_write_ipk[umask] = "022" | 488 | do_package_write_ipk[umask] = "022" |
484 | addtask package_write_ipk before do_package_write after do_packagedata do_package | 489 | addtask package_write_ipk before do_package_write after do_packagedata do_package |
485 | 490 | ||
486 | PACKAGEINDEXES += "package_update_index_ipk;" | 491 | PACKAGEINDEXES += "[ ! -e ${DEPLOY_DIR_IPK} ] || package_update_index_ipk;" |
487 | PACKAGEINDEXDEPS += "opkg-utils-native:do_populate_sysroot" | 492 | PACKAGEINDEXDEPS += "opkg-utils-native:do_populate_sysroot" |
488 | PACKAGEINDEXDEPS += "opkg-native:do_populate_sysroot" | 493 | PACKAGEINDEXDEPS += "opkg-native:do_populate_sysroot" |
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 8ea2bbedb2..8eb93ce15d 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass | |||
@@ -20,7 +20,7 @@ python package_rpm_install () { | |||
20 | # Update the packages indexes ${DEPLOY_DIR_RPM} | 20 | # Update the packages indexes ${DEPLOY_DIR_RPM} |
21 | # | 21 | # |
22 | package_update_index_rpm () { | 22 | package_update_index_rpm () { |
23 | if [ ! -z "${DEPLOY_KEEP_PACKAGES}" -o ! -e "${DEPLOY_DIR_RPM}" ]; then | 23 | if [ ! -z "${DEPLOY_KEEP_PACKAGES}" ]; then |
24 | return | 24 | return |
25 | fi | 25 | fi |
26 | 26 | ||
@@ -45,11 +45,16 @@ package_update_index_rpm () { | |||
45 | echo $arch | 45 | echo $arch |
46 | done | sort | uniq` | 46 | done | sort | uniq` |
47 | 47 | ||
48 | found=0 | ||
48 | for arch in $archs; do | 49 | for arch in $archs; do |
49 | if [ -d ${DEPLOY_DIR_RPM}/$arch ] ; then | 50 | if [ -d ${DEPLOY_DIR_RPM}/$arch ] ; then |
50 | createrepo --update -q ${DEPLOY_DIR_RPM}/$arch | 51 | createrepo --update -q ${DEPLOY_DIR_RPM}/$arch |
52 | found=1 | ||
51 | fi | 53 | fi |
52 | done | 54 | done |
55 | if [ "$found" != "1" ]; then | ||
56 | bbfatal "There are no packages in ${DEPLOY_DIR_RPM}!" | ||
57 | fi | ||
53 | } | 58 | } |
54 | 59 | ||
55 | rpm_log_check() { | 60 | rpm_log_check() { |
@@ -1129,6 +1134,6 @@ do_package_write_rpm[cleandirs] = "${PKGWRITEDIRRPM}" | |||
1129 | do_package_write_rpm[umask] = "022" | 1134 | do_package_write_rpm[umask] = "022" |
1130 | addtask package_write_rpm before do_package_write after do_packagedata do_package | 1135 | addtask package_write_rpm before do_package_write after do_packagedata do_package |
1131 | 1136 | ||
1132 | PACKAGEINDEXES += "package_update_index_rpm; [ ! -e ${DEPLOY_DIR_RPM} ] || createrepo ${DEPLOY_DIR_RPM};" | 1137 | PACKAGEINDEXES += "[ ! -e ${DEPLOY_DIR_RPM} ] || package_update_index_rpm;" |
1133 | PACKAGEINDEXDEPS += "rpm-native:do_populate_sysroot" | 1138 | PACKAGEINDEXDEPS += "rpm-native:do_populate_sysroot" |
1134 | PACKAGEINDEXDEPS += "createrepo-native:do_populate_sysroot" | 1139 | PACKAGEINDEXDEPS += "createrepo-native:do_populate_sysroot" |