diff options
| -rw-r--r-- | meta/classes/package.bbclass | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 6e7e06ed53..7c79c69287 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass | |||
| @@ -1783,6 +1783,10 @@ python do_package () { | |||
| 1783 | # as any change to rpmdeps requires this to be rerun. | 1783 | # as any change to rpmdeps requires this to be rerun. |
| 1784 | # PACKAGE_BBCLASS_VERSION = "1" | 1784 | # PACKAGE_BBCLASS_VERSION = "1" |
| 1785 | 1785 | ||
| 1786 | ########################################################################### | ||
| 1787 | # Sanity test the setup | ||
| 1788 | ########################################################################### | ||
| 1789 | |||
| 1786 | packages = (d.getVar('PACKAGES', True) or "").split() | 1790 | packages = (d.getVar('PACKAGES', True) or "").split() |
| 1787 | if len(packages) < 1: | 1791 | if len(packages) < 1: |
| 1788 | bb.debug(1, "No packages to build, skipping do_package") | 1792 | bb.debug(1, "No packages to build, skipping do_package") |
| @@ -1798,12 +1802,24 @@ python do_package () { | |||
| 1798 | bb.error("WORKDIR, DEPLOY_DIR, D, PN and PKGD all must be defined, unable to package") | 1802 | bb.error("WORKDIR, DEPLOY_DIR, D, PN and PKGD all must be defined, unable to package") |
| 1799 | return | 1803 | return |
| 1800 | 1804 | ||
| 1805 | ########################################################################### | ||
| 1806 | # Setup PKGD (from D) | ||
| 1807 | ########################################################################### | ||
| 1808 | |||
| 1801 | for f in (d.getVar('PACKAGEBUILDPKGD', True) or '').split(): | 1809 | for f in (d.getVar('PACKAGEBUILDPKGD', True) or '').split(): |
| 1802 | bb.build.exec_func(f, d) | 1810 | bb.build.exec_func(f, d) |
| 1803 | 1811 | ||
| 1812 | ########################################################################### | ||
| 1813 | # Split up PKGD into PKGDEST | ||
| 1814 | ########################################################################### | ||
| 1815 | |||
| 1804 | for f in (d.getVar('PACKAGESPLITFUNCS', True) or '').split(): | 1816 | for f in (d.getVar('PACKAGESPLITFUNCS', True) or '').split(): |
| 1805 | bb.build.exec_func(f, d) | 1817 | bb.build.exec_func(f, d) |
| 1806 | 1818 | ||
| 1819 | ########################################################################### | ||
| 1820 | # Process PKGDEST | ||
| 1821 | ########################################################################### | ||
| 1822 | |||
| 1807 | # Build global list of files in each split package | 1823 | # Build global list of files in each split package |
| 1808 | global pkgfiles | 1824 | global pkgfiles |
| 1809 | pkgfiles = {} | 1825 | pkgfiles = {} |
