diff options
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/kernel.bbclass | 8 | ||||
| -rw-r--r-- | meta/classes/package_ipk.bbclass | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index e4e8ee43ea..a6112e8913 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass | |||
| @@ -127,9 +127,9 @@ PACKAGES_DYNAMIC += "^kernel-firmware-.*" | |||
| 127 | export OS = "${TARGET_OS}" | 127 | export OS = "${TARGET_OS}" |
| 128 | export CROSS_COMPILE = "${TARGET_PREFIX}" | 128 | export CROSS_COMPILE = "${TARGET_PREFIX}" |
| 129 | 129 | ||
| 130 | KERNEL_PRIORITY ?= "${@int(d.getVar('PV',1).split('-')[0].split('+')[0].split('.')[0]) * 10000 + \ | 130 | KERNEL_PRIORITY ?= "${@int(d.getVar('PV', True).split('-')[0].split('+')[0].split('.')[0]) * 10000 + \ |
| 131 | int(d.getVar('PV',1).split('-')[0].split('+')[0].split('.')[1]) * 100 + \ | 131 | int(d.getVar('PV', True).split('-')[0].split('+')[0].split('.')[1]) * 100 + \ |
| 132 | int(d.getVar('PV',1).split('-')[0].split('+')[0].split('.')[-1])}" | 132 | int(d.getVar('PV', True).split('-')[0].split('+')[0].split('.')[-1])}" |
| 133 | 133 | ||
| 134 | KERNEL_RELEASE ?= "${KERNEL_VERSION}" | 134 | KERNEL_RELEASE ?= "${KERNEL_VERSION}" |
| 135 | 135 | ||
| @@ -140,7 +140,7 @@ KERNEL_IMAGEDEST = "boot" | |||
| 140 | # | 140 | # |
| 141 | # configuration | 141 | # configuration |
| 142 | # | 142 | # |
| 143 | export CMDLINE_CONSOLE = "console=${@d.getVar("KERNEL_CONSOLE",1) or "ttyS0"}" | 143 | export CMDLINE_CONSOLE = "console=${@d.getVar("KERNEL_CONSOLE", True) or "ttyS0"}" |
| 144 | 144 | ||
| 145 | KERNEL_VERSION = "${@get_kernelversion_headers('${B}')}" | 145 | KERNEL_VERSION = "${@get_kernelversion_headers('${B}')}" |
| 146 | 146 | ||
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index e32b9cb5fd..930e154bd7 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass | |||
| @@ -245,7 +245,7 @@ python do_package_ipk () { | |||
| 245 | 245 | ||
| 246 | os.chdir(basedir) | 246 | os.chdir(basedir) |
| 247 | ret = subprocess.call("PATH=\"%s\" %s %s %s" % (localdata.getVar("PATH", True), | 247 | ret = subprocess.call("PATH=\"%s\" %s %s %s" % (localdata.getVar("PATH", True), |
| 248 | d.getVar("OPKGBUILDCMD",1), pkg, pkgoutdir), shell=True) | 248 | d.getVar("OPKGBUILDCMD", True), pkg, pkgoutdir), shell=True) |
| 249 | if ret != 0: | 249 | if ret != 0: |
| 250 | bb.utils.unlockfile(lf) | 250 | bb.utils.unlockfile(lf) |
| 251 | raise bb.build.FuncFailed("opkg-build execution failed") | 251 | raise bb.build.FuncFailed("opkg-build execution failed") |
