diff options
| author | Florian Boor <florian.boor@kernelconcepts.de> | 2007-07-03 16:56:39 +0000 |
|---|---|---|
| committer | Florian Boor <florian.boor@kernelconcepts.de> | 2007-07-03 16:56:39 +0000 |
| commit | 7e66b8bf6f85be497947f41753a4a0f47dfb1c34 (patch) | |
| tree | 34e1add061e7348244bee386aa76abf19e23eb5d | |
| parent | 9a3be9e1943af1c7e54781e5de8d91794d3528bc (diff) | |
| parent | 832e4c122ae3dd538bfea676d6da1d67b765d55b (diff) | |
merge of '2d48e0fc062c46f883515824089be8f20112f660'
and '4a07a607b67720e33adbdc68da34bdc153b7f87d'
| -rw-r--r-- | packages/0xFFFF/0xffff-native_0.2.bb | 2 | ||||
| -rw-r--r-- | packages/0xFFFF/0xffff.inc | 2 | ||||
| -rw-r--r-- | packages/linux/linux-x86_2.6.20.bb | 11 |
3 files changed, 13 insertions, 2 deletions
diff --git a/packages/0xFFFF/0xffff-native_0.2.bb b/packages/0xFFFF/0xffff-native_0.2.bb index b709977179..1cee49aafd 100644 --- a/packages/0xFFFF/0xffff-native_0.2.bb +++ b/packages/0xFFFF/0xffff-native_0.2.bb @@ -1,5 +1,7 @@ require 0xffff.inc +DEPENDS = "libusb-native" + inherit native do_stage() { diff --git a/packages/0xFFFF/0xffff.inc b/packages/0xFFFF/0xffff.inc index 470db7ccbf..db281467ed 100644 --- a/packages/0xFFFF/0xffff.inc +++ b/packages/0xFFFF/0xffff.inc @@ -1,5 +1,5 @@ DESCRIPTION = "The 'Open Free Fiasco Firmware Flasher' aka 0xFFFF utility aims to implement a free (GPL'd) userspace handler for the NOLO bootloader." -LICENSE = "GPLv2" +LICENSE = "GPLv3" SRC_URI = "http://www.nopcode.org/0xFFFF/get/0xFFFF-${PV}.tar.gz" diff --git a/packages/linux/linux-x86_2.6.20.bb b/packages/linux/linux-x86_2.6.20.bb index ec79c94bc4..cfc8af6f21 100644 --- a/packages/linux/linux-x86_2.6.20.bb +++ b/packages/linux/linux-x86_2.6.20.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Linux Kernel for x86 compatible machines" SECTION = "kernel" LICENSE = "GPL" -PR = "r1" +PR = "r2" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 " @@ -29,3 +29,12 @@ do_configure_prepend_i686() { install -m 0644 ${WORKDIR}/i686-defconfig ${S}/.config } + +do_deploy() { + install -d ${DEPLOY_DIR_IMAGE} + install -m 0644 arch/i386/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME} +} + +do_deploy[dirs] = "${S}" + +addtask deploy before do_populate_staging after do_compile |