diff options
author | Tom Rini <tom_rini@mentor.com> | 2010-08-25 12:57:13 -0700 |
---|---|---|
committer | Tom Rini <tom_rini@mentor.com> | 2010-08-25 12:57:13 -0700 |
commit | 26618b8ddc984ff7c89f0cabffdf43f23f5efa87 (patch) | |
tree | 6583e4d8bd8e4f6d317320383e4502eb693ff1ab | |
parent | 9178590b902f30fc0cfd6e4cf696a599fd58ec2f (diff) |
dosfstools: Drop 2.10, make 2.11 use BBCLASSEXTEND for native
2.10 and 2.11 are both GPLv2 (or later), 3.0.x is GPLv3. While in
here take most of the advice oe-stylize.py offers
Signed-off-by: Tom Rini <tom_rini@mentor.com>
-rw-r--r-- | recipes/dosfstools/dosfstools-native_2.10.bb | 27 | ||||
-rw-r--r-- | recipes/dosfstools/dosfstools_2.10.bb | 25 | ||||
-rw-r--r-- | recipes/dosfstools/dosfstools_2.11.bb | 20 |
3 files changed, 10 insertions, 62 deletions
diff --git a/recipes/dosfstools/dosfstools-native_2.10.bb b/recipes/dosfstools/dosfstools-native_2.10.bb deleted file mode 100644 index c61e33d2e9..0000000000 --- a/recipes/dosfstools/dosfstools-native_2.10.bb +++ /dev/null @@ -1,27 +0,0 @@ -# dosfstools-native OE build file -# Copyright (C) 2004-2006, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -require dosfstools_${PV}.bb -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dosfstools-${PV}" - -S="${WORKDIR}/dosfstools-${PV}" - -PR ="r4" - -SRC_URI = "ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-${PV}.src.tar.gz \ - file://mkdosfs-bootcode.patch \ - file://mkdosfs-dir.patch \ - file://alignment_hack.patch \ - file://dosfstools-2.10-kernel-2.6.patch \ - file://msdos_fat12_undefined.patch \ - file://dosfstools-msdos_fs-types.patch \ - file://include-linux-types.patch \ - file://2.6.20-syscall.patch" - -inherit native - -do_stage() { - install -m 755 ${S}/mkdosfs/mkdosfs ${STAGING_BINDIR}/mkdosfs - install -m 755 ${S}/dosfsck/dosfsck ${STAGING_BINDIR}/dosfsck -} diff --git a/recipes/dosfstools/dosfstools_2.10.bb b/recipes/dosfstools/dosfstools_2.10.bb deleted file mode 100644 index bc5a87ead3..0000000000 --- a/recipes/dosfstools/dosfstools_2.10.bb +++ /dev/null @@ -1,25 +0,0 @@ -# dosfstools OE build file -# Copyright (C) 2004-2006, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION = "DOS FAT Filesystem Utilities" - -SECTION = "base" -PRIORITY = "optional" -LICENSE = "GPLv2" - -PR = "r2" - -SRC_URI = "ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-${PV}.src.tar.gz \ - file://alignment_hack.patch \ - file://dosfstools-2.10-kernel-2.6.patch \ - file://msdos_fat12_undefined.patch \ - file://include-linux-types.patch" - -do_install () { - oe_runmake "PREFIX=${D}" "SBINDIR=${D}${sbindir}" \ - "MANDIR=${D}${mandir}/man8" install -} - -SRC_URI[md5sum] = "59a02f311a891af8787c4c9e28c6b89b" -SRC_URI[sha256sum] = "55a7b2f5ea4506bde935ee3145573e1773427fc72283a36796c7c2cf861dd064" diff --git a/recipes/dosfstools/dosfstools_2.11.bb b/recipes/dosfstools/dosfstools_2.11.bb index f0ca990e96..a66c56721d 100644 --- a/recipes/dosfstools/dosfstools_2.11.bb +++ b/recipes/dosfstools/dosfstools_2.11.bb @@ -1,26 +1,26 @@ # dosfstools OE build file # Copyright (C) 2004-2006, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) - DESCRIPTION = "DOS FAT Filesystem Utilities" - SECTION = "base" PRIORITY = "optional" LICENSE = "GPLv2" - PR = "r2" SRC_URI = "ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-${PV}.src.tar.gz \ - file://alignment_hack.patch \ + file://alignment_hack.patch \ file://msdos_fat12_undefined.patch \ - file://include-linux-types.patch" -CFLAGS_append = ' -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' + file://include-linux-types.patch" +SRC_URI[md5sum] = "407d405ade410f7597d364ab5dc8c9f6" +SRC_URI[sha256sum] = "0eac6d12388b3d9ed78684529c1b0d9346fa2abbe406c4d4a3eb5a023c98a484" + +CFLAGS_append = " -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" CFLAGS_append_libc-uclibc = ' ${@base_contains("DISTRO_FEATURES", "largefile", "-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64", "", d)}' do_install () { - oe_runmake "PREFIX=${D}" "SBINDIR=${D}${sbindir}" \ - "MANDIR=${D}${mandir}/man8" install + oe_runmake "PREFIX=${D}" "SBINDIR=${D}${sbindir}" \ + "MANDIR=${D}${mandir}/man8" install } -SRC_URI[md5sum] = "407d405ade410f7597d364ab5dc8c9f6" -SRC_URI[sha256sum] = "0eac6d12388b3d9ed78684529c1b0d9346fa2abbe406c4d4a3eb5a023c98a484" +BBCLASSEXTEND = "native" +NATIVE_INSTALL_WORKS = "1" |