diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-06-25 12:45:53 -0400 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-06-27 14:38:15 -0400 |
commit | 316dfdd917bec6a218f431211d28bf8df6b6fb0f (patch) | |
tree | 5541073f9851f44c2bd67b4959dc776ee3c3810f /import-layers/yocto-poky/meta/recipes-bsp | |
parent | 36acd3e888044dea2ac0b2946f15616f968388c9 (diff) | |
download | talos-openbmc-316dfdd917bec6a218f431211d28bf8df6b6fb0f.tar.gz talos-openbmc-316dfdd917bec6a218f431211d28bf8df6b6fb0f.zip |
Yocto 2.5
Move OpenBMC to Yocto 2.5(sumo)
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Change-Id: I5c5ad6904a16e14c1c397f0baf10c9d465594a78
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-bsp')
31 files changed, 218 insertions, 1095 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/grub/files/gcc8.patch b/import-layers/yocto-poky/meta/recipes-bsp/grub/files/gcc8.patch new file mode 100644 index 000000000..fa7331f1b --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-bsp/grub/files/gcc8.patch @@ -0,0 +1,74 @@ +From 563b1da6e6ae7af46cc8354cadb5dab416989f0a Mon Sep 17 00:00:00 2001 +From: Michael Chang <mchang@suse.com> +Date: Mon, 26 Mar 2018 16:52:34 +0800 +Subject: Fix packed-not-aligned error on GCC 8 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When building with GCC 8, there are several errors regarding packed-not-aligned. + +./include/grub/gpt_partition.h:79:1: error: alignment 1 of ‘struct grub_gpt_partentry’ is less than 8 [-Werror=packed-not-aligned] + +This patch fixes the build error by cleaning up the ambiguity of placing +aligned structure in a packed one. In "struct grub_btrfs_time" and "struct +grub_gpt_part_type", the aligned attribute seems to be superfluous, and also +has to be packed, to ensure the structure is bit-to-bit mapped to the format +laid on disk. I think we could blame to copy and paste error here for the +mistake. In "struct efi_variable", we have to use grub_efi_packed_guid_t, as +the name suggests. :) + +Signed-off-by: Michael Chang <mchang@suse.com> +Tested-by: Michael Chang <mchang@suse.com> +Tested-by: Paul Menzel <paulepanter@users.sourceforge.net> +Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> + +Upstream-Status: Backport http://git.savannah.gnu.org/cgit/grub.git/commit/?id=563b1da6e6ae7af46cc8354cadb5dab416989f0a +--- + grub-core/fs/btrfs.c | 2 +- + include/grub/efiemu/runtime.h | 2 +- + include/grub/gpt_partition.h | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c +index 4849c1c..be19544 100644 +--- a/grub-core/fs/btrfs.c ++++ b/grub-core/fs/btrfs.c +@@ -175,7 +175,7 @@ struct grub_btrfs_time + { + grub_int64_t sec; + grub_uint32_t nanosec; +-} __attribute__ ((aligned (4))); ++} GRUB_PACKED; + + struct grub_btrfs_inode + { +diff --git a/include/grub/efiemu/runtime.h b/include/grub/efiemu/runtime.h +index 9b6b729..36d2ded 100644 +--- a/include/grub/efiemu/runtime.h ++++ b/include/grub/efiemu/runtime.h +@@ -29,7 +29,7 @@ struct grub_efiemu_ptv_rel + + struct efi_variable + { +- grub_efi_guid_t guid; ++ grub_efi_packed_guid_t guid; + grub_uint32_t namelen; + grub_uint32_t size; + grub_efi_uint32_t attributes; +diff --git a/include/grub/gpt_partition.h b/include/grub/gpt_partition.h +index 1b32f67..9668a68 100644 +--- a/include/grub/gpt_partition.h ++++ b/include/grub/gpt_partition.h +@@ -28,7 +28,7 @@ struct grub_gpt_part_type + grub_uint16_t data2; + grub_uint16_t data3; + grub_uint8_t data4[8]; +-} __attribute__ ((aligned(8))); ++} GRUB_PACKED; + typedef struct grub_gpt_part_type grub_gpt_part_type_t; + + #define GRUB_GPT_PARTITION_TYPE_EMPTY \ +-- +cgit v1.0-41-gc330 + diff --git a/import-layers/yocto-poky/meta/recipes-bsp/grub/files/grub-module-explicitly-keeps-symbole-.module_license.patch b/import-layers/yocto-poky/meta/recipes-bsp/grub/files/grub-module-explicitly-keeps-symbole-.module_license.patch index 935c472cf..ffc2d40d8 100644 --- a/import-layers/yocto-poky/meta/recipes-bsp/grub/files/grub-module-explicitly-keeps-symbole-.module_license.patch +++ b/import-layers/yocto-poky/meta/recipes-bsp/grub/files/grub-module-explicitly-keeps-symbole-.module_license.patch @@ -43,19 +43,16 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> grub-core/genmod.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/grub-core/genmod.sh.in b/grub-core/genmod.sh.in -index 76df0bb..39a9cfc 100644 ---- a/grub-core/genmod.sh.in -+++ b/grub-core/genmod.sh.in -@@ -59,7 +59,7 @@ if test x@TARGET_APPLE_CC@ != x1; then +Index: grub-2.02/grub-core/genmod.sh.in +=================================================================== +--- grub-2.02.orig/grub-core/genmod.sh.in ++++ grub-2.02/grub-core/genmod.sh.in +@@ -56,7 +56,7 @@ if test x@TARGET_APPLE_LINKER@ != x1; th if test x@platform@ != xemu; then - @STRIP@ --strip-unneeded \ + @TARGET_STRIP@ --strip-unneeded \ -K grub_mod_init -K grub_mod_fini \ - -K _grub_mod_init -K _grub_mod_fini \ + -K _grub_mod_init -K _grub_mod_fini -K .module_license \ -R .note.gnu.gold-version -R .note.GNU-stack \ - -R .note -R .comment $tmpfile || exit 1 + -R .note -R .comment -R .ARM.exidx $tmpfile || exit 1 fi --- -2.8.1 - diff --git a/import-layers/yocto-poky/meta/recipes-bsp/grub/grub-bootconf_1.00.bb b/import-layers/yocto-poky/meta/recipes-bsp/grub/grub-bootconf_1.00.bb new file mode 100644 index 000000000..750f8c808 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-bsp/grub/grub-bootconf_1.00.bb @@ -0,0 +1,29 @@ +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +SUMMARY = "Basic grub.cfg for use in EFI systems" + +RPROVIDES_${PN} += "virtual/grub-bootconf" + +inherit grub-efi-cfg + +S = "${WORKDIR}" + +GRUB_CFG = "${S}/grub-bootconf" +LABELS = "boot" + +ROOT ?= "root=/dev/sda2" + +python do_configure() { + bb.build.exec_func('build_efi_cfg', d) +} + +do_configure[vardeps] += "APPEND ROOT" + +do_install() { + install -d ${D}/boot + install -d ${D}/boot/EFI + install -d ${D}/boot/EFI/BOOT + install grub-bootconf ${D}/boot/EFI/BOOT/grub.cfg +} + +FILES_${PN} = "/boot/EFI/BOOT/grub.cfg" diff --git a/import-layers/yocto-poky/meta/recipes-bsp/grub/grub-efi_2.02.bb b/import-layers/yocto-poky/meta/recipes-bsp/grub/grub-efi_2.02.bb index 128da162d..7bfc8eece 100644 --- a/import-layers/yocto-poky/meta/recipes-bsp/grub/grub-efi_2.02.bb +++ b/import-layers/yocto-poky/meta/recipes-bsp/grub/grub-efi_2.02.bb @@ -3,7 +3,7 @@ require grub2.inc GRUBPLATFORM = "efi" DEPENDS_append_class-target = " grub-efi-native" -RDEPENDS_${PN}_class-target = "diffutils freetype" +RDEPENDS_${PN}_class-target = "diffutils freetype grub-common virtual/grub-bootconf" SRC_URI += " \ file://cfg \ @@ -15,16 +15,22 @@ S = "${WORKDIR}/grub-${PV}" python __anonymous () { import re target = d.getVar('TARGET_ARCH') + prefix = "" if d.getVar('EFI_PROVIDER') == "grub-efi" else "grub-efi-" if target == "x86_64": grubtarget = 'x86_64' - grubimage = "grub-efi-bootx64.efi" + grubimage = prefix + "bootx64.efi" elif re.match('i.86', target): grubtarget = 'i386' - grubimage = "grub-efi-bootia32.efi" + grubimage = prefix + "bootia32.efi" + elif re.match('aarch64', target): + grubtarget = 'arm64' + grubimage = prefix + "bootaa64.efi" else: - raise bb.parse.SkipPackage("grub-efi is incompatible with target %s" % target) + raise bb.parse.SkipRecipe("grub-efi is incompatible with target %s" % target) d.setVar("GRUB_TARGET", grubtarget) d.setVar("GRUB_IMAGE", grubimage) + prefix = "grub-efi-" if prefix == "" else "" + d.setVar("GRUB_IMAGE_PREFIX", prefix) } inherit deploy @@ -36,12 +42,36 @@ EXTRA_OECONF += "--enable-efiemu=no" # and many other places in the grub code when compiled with some native gcc compilers (specifically, gentoo) CFLAGS_append_class-native = " -Wno-error=trampolines" +do_mkimage() { + cd ${B} + # Search for the grub.cfg on the local boot media by using the + # built in cfg file provided via this recipe + grub-mkimage -c ../cfg -p /EFI/BOOT -d ./grub-core/ \ + -O ${GRUB_TARGET}-efi -o ./${GRUB_IMAGE_PREFIX}${GRUB_IMAGE} \ + ${GRUB_BUILDIN} +} + +addtask mkimage before do_install after do_compile + +do_mkimage_class-native() { + : +} + +do_install_append_class-target() { + install -d ${D}/boot + install -d ${D}/boot/EFI + install -d ${D}/boot/EFI/BOOT + install -m 644 ${B}/${GRUB_IMAGE_PREFIX}${GRUB_IMAGE} ${D}/boot/EFI/BOOT/${GRUB_IMAGE} +} + do_install_class-native() { install -d ${D}${bindir} install -m 755 grub-mkimage ${D}${bindir} } -do_install_append_class-target() { +do_install_class-target() { + oe_runmake 'DESTDIR=${D}' -C grub-core install + # Remove build host references... find "${D}" -name modinfo.sh -type f -exec \ sed -i \ @@ -52,15 +82,10 @@ do_install_append_class-target() { } GRUB_BUILDIN ?= "boot linux ext2 fat serial part_msdos part_gpt normal \ - efi_gop iso9660 search loadenv test" + efi_gop iso9660 configfile search loadenv test" do_deploy() { - # Search for the grub.cfg on the local boot media by using the - # built in cfg file provided via this recipe - grub-mkimage -c ../cfg -p /EFI/BOOT -d ./grub-core/ \ - -O ${GRUB_TARGET}-efi -o ./${GRUB_IMAGE} \ - ${GRUB_BUILDIN} - install -m 644 ${B}/${GRUB_IMAGE} ${DEPLOYDIR} + install -m 644 ${B}/${GRUB_IMAGE_PREFIX}${GRUB_IMAGE} ${DEPLOYDIR} } do_deploy_class-native() { @@ -69,9 +94,11 @@ do_deploy_class-native() { addtask deploy after do_install before do_build -FILES_${PN} += "${libdir}/grub/${GRUB_TARGET}-efi \ - ${datadir}/grub \ - " +FILES_${PN} = "${libdir}/grub/${GRUB_TARGET}-efi \ + ${datadir}/grub \ + /boot/EFI/BOOT/${GRUB_IMAGE} \ + " + # 64-bit binaries are expected for the bootloader with an x32 userland INSANE_SKIP_${PN}_append_linux-gnux32 = " arch" diff --git a/import-layers/yocto-poky/meta/recipes-bsp/grub/grub2.inc b/import-layers/yocto-poky/meta/recipes-bsp/grub/grub2.inc index 28f96bb16..a8f335e1f 100644 --- a/import-layers/yocto-poky/meta/recipes-bsp/grub/grub2.inc +++ b/import-layers/yocto-poky/meta/recipes-bsp/grub/grub2.inc @@ -18,6 +18,7 @@ SRC_URI = "https://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \ file://grub-module-explicitly-keeps-symbole-.module_license.patch \ file://0001-grub.d-10_linux.in-add-oe-s-kernel-name.patch \ file://fix.build.with.gcc-7.patch \ + file://gcc8.patch \ " SRC_URI[md5sum] = "1116d1f60c840e6dbd67abbc99acb45d" SRC_URI[sha256sum] = "660ee136fbcee08858516ed4de2ad87068bfe1b6b8b37896ce3529ff054a726d" @@ -47,7 +48,7 @@ EXTRA_OECONF = "--with-platform=${GRUBPLATFORM} \ PACKAGECONFIG ??= "" PACKAGECONFIG[grub-mount] = "--enable-grub-mount,--disable-grub-mount,fuse" -PACKAGECONFIG[device-mapper] = "--enable-device-mapper,--disable-device-mapper,lvm2" +PACKAGECONFIG[device-mapper] = "--enable-device-mapper,--disable-device-mapper,libdevmapper" # grub2 creates its own set of -nostdinc / -isystem / -ffreestanding CFLAGS and # OE's default BUILD_CFLAGS (assigned to CFLAGS for native builds) etc, conflict @@ -67,12 +68,4 @@ do_configure_prepend() { ${S}/autogen.sh ) } -# grub and grub-efi's sysroot/${datadir}/grub/grub-mkconfig_lib are -# conflicted, remove it since no one uses it. -SYSROOT_DIRS_BLACKLIST += "${datadir}/grub/grub-mkconfig_lib" - -PACKAGES =+ "${PN}-editenv" - -FILES_${PN}-editenv = "${bindir}/grub-editenv" -RDEPENDS_${PN} += "${PN}-editenv" RDEPENDS_${PN}_class-native = "" diff --git a/import-layers/yocto-poky/meta/recipes-bsp/grub/grub_2.02.bb b/import-layers/yocto-poky/meta/recipes-bsp/grub/grub_2.02.bb index 3e61f6a16..e0973759f 100644 --- a/import-layers/yocto-poky/meta/recipes-bsp/grub/grub_2.02.bb +++ b/import-layers/yocto-poky/meta/recipes-bsp/grub/grub_2.02.bb @@ -1,6 +1,18 @@ require grub2.inc -RDEPENDS_${PN} += "diffutils freetype" +RDEPENDS_${PN}-common += "${PN}-editenv" +RDEPENDS_${PN} += "diffutils freetype ${PN}-common" + +RPROVIDES_${PN}-editenv += "${PN}-efi-editenv" + +PACKAGES =+ "${PN}-editenv ${PN}-common" +FILES_${PN}-editenv = "${bindir}/grub-editenv" +FILES_${PN}-common = " \ + ${bindir} \ + ${sysconfdir} \ + ${sbindir} \ + ${datadir}/grub \ +" do_install_append () { install -d ${D}${sysconfdir}/grub.d diff --git a/import-layers/yocto-poky/meta/recipes-bsp/hostap/files/COPYING.patch b/import-layers/yocto-poky/meta/recipes-bsp/hostap/files/COPYING.patch deleted file mode 100644 index 05c70c92e..000000000 --- a/import-layers/yocto-poky/meta/recipes-bsp/hostap/files/COPYING.patch +++ /dev/null @@ -1,346 +0,0 @@ -Upstream-Status: Inappropriate [other] - -diff -ruN hostap-conf-1.0-orig/COPYING hostap-conf-1.0/COPYING ---- hostap-conf-1.0-orig/COPYING 1970-01-01 08:00:00.000000000 +0800 -+++ hostap-conf-1.0/COPYING 2010-12-09 16:36:48.000000000 +0800 -@@ -0,0 +1,340 @@ -+ GNU GENERAL PUBLIC LICENSE -+ Version 2, June 1991 -+ -+ Copyright (C) 1989, 1991 Free Software Foundation, Inc. -+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ Everyone is permitted to copy and distribute verbatim copies -+ of this license document, but changing it is not allowed. -+ -+ Preamble -+ -+ The licenses for most software are designed to take away your -+freedom to share and change it. By contrast, the GNU General Public -+License is intended to guarantee your freedom to share and change free -+software--to make sure the software is free for all its users. This -+General Public License applies to most of the Free Software -+Foundation's software and to any other program whose authors commit to -+using it. (Some other Free Software Foundation software is covered by -+the GNU Library General Public License instead.) You can apply it to -+your programs, too. -+ -+ When we speak of free software, we are referring to freedom, not -+price. Our General Public Licenses are designed to make sure that you -+have the freedom to distribute copies of free software (and charge for -+this service if you wish), that you receive source code or can get it -+if you want it, that you can change the software or use pieces of it -+in new free programs; and that you know you can do these things. -+ -+ To protect your rights, we need to make restrictions that forbid -+anyone to deny you these rights or to ask you to surrender the rights. -+These restrictions translate to certain responsibilities for you if you -+distribute copies of the software, or if you modify it. -+ -+ For example, if you distribute copies of such a program, whether -+gratis or for a fee, you must give the recipients all the rights that -+you have. You must make sure that they, too, receive or can get the -+source code. And you must show them these terms so they know their -+rights. -+ -+ We protect your rights with two steps: (1) copyright the software, and -+(2) offer you this license which gives you legal permission to copy, -+distribute and/or modify the software. -+ -+ Also, for each author's protection and ours, we want to make certain -+that everyone understands that there is no warranty for this free -+software. If the software is modified by someone else and passed on, we -+want its recipients to know that what they have is not the original, so -+that any problems introduced by others will not reflect on the original -+authors' reputations. -+ -+ Finally, any free program is threatened constantly by software -+patents. We wish to avoid the danger that redistributors of a free -+program will individually obtain patent licenses, in effect making the -+program proprietary. To prevent this, we have made it clear that any -+patent must be licensed for everyone's free use or not licensed at all. -+ -+ The precise terms and conditions for copying, distribution and -+modification follow. -+ -+ GNU GENERAL PUBLIC LICENSE -+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -+ -+ 0. This License applies to any program or other work which contains -+a notice placed by the copyright holder saying it may be distributed -+under the terms of this General Public License. The "Program", below, -+refers to any such program or work, and a "work based on the Program" -+means either the Program or any derivative work under copyright law: -+that is to say, a work containing the Program or a portion of it, -+either verbatim or with modifications and/or translated into another -+language. (Hereinafter, translation is included without limitation in -+the term "modification".) Each licensee is addressed as "you". -+ -+Activities other than copying, distribution and modification are not -+covered by this License; they are outside its scope. The act of -+running the Program is not restricted, and the output from the Program -+is covered only if its contents constitute a work based on the -+Program (independent of having been made by running the Program). -+Whether that is true depends on what the Program does. -+ -+ 1. You may copy and distribute verbatim copies of the Program's -+source code as you receive it, in any medium, provided that you -+conspicuously and appropriately publish on each copy an appropriate -+copyright notice and disclaimer of warranty; keep intact all the -+notices that refer to this License and to the absence of any warranty; -+and give any other recipients of the Program a copy of this License -+along with the Program. -+ -+You may charge a fee for the physical act of transferring a copy, and -+you may at your option offer warranty protection in exchange for a fee. -+ -+ 2. You may modify your copy or copies of the Program or any portion -+of it, thus forming a work based on the Program, and copy and -+distribute such modifications or work under the terms of Section 1 -+above, provided that you also meet all of these conditions: -+ -+ a) You must cause the modified files to carry prominent notices -+ stating that you changed the files and the date of any change. -+ -+ b) You must cause any work that you distribute or publish, that in -+ whole or in part contains or is derived from the Program or any -+ part thereof, to be licensed as a whole at no charge to all third -+ parties under the terms of this License. -+ -+ c) If the modified program normally reads commands interactively -+ when run, you must cause it, when started running for such -+ interactive use in the most ordinary way, to print or display an -+ announcement including an appropriate copyright notice and a -+ notice that there is no warranty (or else, saying that you provide -+ a warranty) and that users may redistribute the program under -+ these conditions, and telling the user how to view a copy of this -+ License. (Exception: if the Program itself is interactive but -+ does not normally print such an announcement, your work based on -+ the Program is not required to print an announcement.) -+ -+These requirements apply to the modified work as a whole. If -+identifiable sections of that work are not derived from the Program, -+and can be reasonably considered independent and separate works in -+themselves, then this License, and its terms, do not apply to those -+sections when you distribute them as separate works. But when you -+distribute the same sections as part of a whole which is a work based -+on the Program, the distribution of the whole must be on the terms of -+this License, whose permissions for other licensees extend to the -+entire whole, and thus to each and every part regardless of who wrote it. -+ -+Thus, it is not the intent of this section to claim rights or contest -+your rights to work written entirely by you; rather, the intent is to -+exercise the right to control the distribution of derivative or -+collective works based on the Program. -+ -+In addition, mere aggregation of another work not based on the Program -+with the Program (or with a work based on the Program) on a volume of -+a storage or distribution medium does not bring the other work under -+the scope of this License. -+ -+ 3. You may copy and distribute the Program (or a work based on it, -+under Section 2) in object code or executable form under the terms of -+Sections 1 and 2 above provided that you also do one of the following: -+ -+ a) Accompany it with the complete corresponding machine-readable -+ source code, which must be distributed under the terms of Sections -+ 1 and 2 above on a medium customarily used for software interchange; or, -+ -+ b) Accompany it with a written offer, valid for at least three -+ years, to give any third party, for a charge no more than your -+ cost of physically performing source distribution, a complete -+ machine-readable copy of the corresponding source code, to be -+ distributed under the terms of Sections 1 and 2 above on a medium -+ customarily used for software interchange; or, -+ -+ c) Accompany it with the information you received as to the offer -+ to distribute corresponding source code. (This alternative is -+ allowed only for noncommercial distribution and only if you -+ received the program in object code or executable form with such -+ an offer, in accord with Subsection b above.) -+ -+The source code for a work means the preferred form of the work for -+making modifications to it. For an executable work, complete source -+code means all the source code for all modules it contains, plus any -+associated interface definition files, plus the scripts used to -+control compilation and installation of the executable. However, as a -+special exception, the source code distributed need not include -+anything that is normally distributed (in either source or binary -+form) with the major components (compiler, kernel, and so on) of the -+operating system on which the executable runs, unless that component -+itself accompanies the executable. -+ -+If distribution of executable or object code is made by offering -+access to copy from a designated place, then offering equivalent -+access to copy the source code from the same place counts as -+distribution of the source code, even though third parties are not -+compelled to copy the source along with the object code. -+ -+ 4. You may not copy, modify, sublicense, or distribute the Program -+except as expressly provided under this License. Any attempt -+otherwise to copy, modify, sublicense or distribute the Program is -+void, and will automatically terminate your rights under this License. -+However, parties who have received copies, or rights, from you under -+this License will not have their licenses terminated so long as such -+parties remain in full compliance. -+ -+ 5. You are not required to accept this License, since you have not -+signed it. However, nothing else grants you permission to modify or -+distribute the Program or its derivative works. These actions are -+prohibited by law if you do not accept this License. Therefore, by -+modifying or distributing the Program (or any work based on the -+Program), you indicate your acceptance of this License to do so, and -+all its terms and conditions for copying, distributing or modifying -+the Program or works based on it. -+ -+ 6. Each time you redistribute the Program (or any work based on the -+Program), the recipient automatically receives a license from the -+original licensor to copy, distribute or modify the Program subject to -+these terms and conditions. You may not impose any further -+restrictions on the recipients' exercise of the rights granted herein. -+You are not responsible for enforcing compliance by third parties to -+this License. -+ -+ 7. If, as a consequence of a court judgment or allegation of patent -+infringement or for any other reason (not limited to patent issues), -+conditions are imposed on you (whether by court order, agreement or -+otherwise) that contradict the conditions of this License, they do not -+excuse you from the conditions of this License. If you cannot -+distribute so as to satisfy simultaneously your obligations under this -+License and any other pertinent obligations, then as a consequence you -+may not distribute the Program at all. For example, if a patent -+license would not permit royalty-free redistribution of the Program by -+all those who receive copies directly or indirectly through you, then -+the only way you could satisfy both it and this License would be to -+refrain entirely from distribution of the Program. -+ -+If any portion of this section is held invalid or unenforceable under -+any particular circumstance, the balance of the section is intended to -+apply and the section as a whole is intended to apply in other -+circumstances. -+ -+It is not the purpose of this section to induce you to infringe any -+patents or other property right claims or to contest validity of any -+such claims; this section has the sole purpose of protecting the -+integrity of the free software distribution system, which is -+implemented by public license practices. Many people have made -+generous contributions to the wide range of software distributed -+through that system in reliance on consistent application of that -+system; it is up to the author/donor to decide if he or she is willing -+to distribute software through any other system and a licensee cannot -+impose that choice. -+ -+This section is intended to make thoroughly clear what is believed to -+be a consequence of the rest of this License. -+ -+ 8. If the distribution and/or use of the Program is restricted in -+certain countries either by patents or by copyrighted interfaces, the -+original copyright holder who places the Program under this License -+may add an explicit geographical distribution limitation excluding -+those countries, so that distribution is permitted only in or among -+countries not thus excluded. In such case, this License incorporates -+the limitation as if written in the body of this License. -+ -+ 9. The Free Software Foundation may publish revised and/or new versions -+of the General Public License from time to time. Such new versions will -+be similar in spirit to the present version, but may differ in detail to -+address new problems or concerns. -+ -+Each version is given a distinguishing version number. If the Program -+specifies a version number of this License which applies to it and "any -+later version", you have the option of following the terms and conditions -+either of that version or of any later version published by the Free -+Software Foundation. If the Program does not specify a version number of -+this License, you may choose any version ever published by the Free Software -+Foundation. -+ -+ 10. If you wish to incorporate parts of the Program into other free -+programs whose distribution conditions are different, write to the author -+to ask for permission. For software which is copyrighted by the Free -+Software Foundation, write to the Free Software Foundation; we sometimes -+make exceptions for this. Our decision will be guided by the two goals -+of preserving the free status of all derivatives of our free software and -+of promoting the sharing and reuse of software generally. -+ -+ NO WARRANTY -+ -+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -+REPAIR OR CORRECTION. -+ -+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -+POSSIBILITY OF SUCH DAMAGES. -+ -+ END OF TERMS AND CONDITIONS -+ -+ How to Apply These Terms to Your New Programs -+ -+ If you develop a new program, and you want it to be of the greatest -+possible use to the public, the best way to achieve this is to make it -+free software which everyone can redistribute and change under these terms. -+ -+ To do so, attach the following notices to the program. It is safest -+to attach them to the start of each source file to most effectively -+convey the exclusion of warranty; and each file should have at least -+the "copyright" line and a pointer to where the full notice is found. -+ -+ <one line to give the program's name and a brief idea of what it does.> -+ Copyright (C) <year> <name of author> -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software -+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ -+ -+Also add information on how to contact you by electronic and paper mail. -+ -+If the program is interactive, make it output a short notice like this -+when it starts in an interactive mode: -+ -+ Gnomovision version 69, Copyright (C) year name of author -+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. -+ This is free software, and you are welcome to redistribute it -+ under certain conditions; type `show c' for details. -+ -+The hypothetical commands `show w' and `show c' should show the appropriate -+parts of the General Public License. Of course, the commands you use may -+be called something other than `show w' and `show c'; they could even be -+mouse-clicks or menu items--whatever suits your program. -+ -+You should also get your employer (if you work as a programmer) or your -+school, if any, to sign a "copyright disclaimer" for the program, if -+necessary. Here is a sample; alter the names: -+ -+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program -+ `Gnomovision' (which makes passes at compilers) written by James Hacker. -+ -+ <signature of Ty Coon>, 1 April 1989 -+ Ty Coon, President of Vice -+ -+This General Public License does not permit incorporating your program into -+proprietary programs. If your program is a subroutine library, you may -+consider it more useful to permit linking proprietary applications with the -+library. If this is what you want to do, use the GNU Library General -+Public License instead of this License. diff --git a/import-layers/yocto-poky/meta/recipes-bsp/hostap/files/hostap-fw-load.patch b/import-layers/yocto-poky/meta/recipes-bsp/hostap/files/hostap-fw-load.patch deleted file mode 100644 index 050bdc113..000000000 --- a/import-layers/yocto-poky/meta/recipes-bsp/hostap/files/hostap-fw-load.patch +++ /dev/null @@ -1,22 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - -Upstream-Status: Inappropriate [configuration] - ---- hostap-utils-0.2.4/hostap_fw_load~hostap-fw-load -+++ hostap-utils-0.2.4/hostap_fw_load -@@ -6,9 +6,9 @@ - # Firmware images for the card - # TODO: could try to select correct firmware type automatically - --PRI=/etc/pcmcia/PM010102.HEX --STA=/etc/pcmcia/RF010802.HEX --PRISM2_SREC=/usr/local/bin/prism2_srec -+PRI=/etc/pcmcia/pm010102.hex -+STA=/etc/pcmcia/rf010804.hex -+PRISM2_SREC=/usr/sbin/prism2_srec - - set -e - diff --git a/import-layers/yocto-poky/meta/recipes-bsp/hostap/files/hostap_cs.conf b/import-layers/yocto-poky/meta/recipes-bsp/hostap/files/hostap_cs.conf deleted file mode 100644 index 8dda82aad..000000000 --- a/import-layers/yocto-poky/meta/recipes-bsp/hostap/files/hostap_cs.conf +++ /dev/null @@ -1,193 +0,0 @@ -module "hostap_cs" opts "channel=3 iw_mode=2 essid=any ignore_cis_vcc=1" - -card "Actiontec 802CI2" - manfid 0x1668, 0x0101 - bind "hostap_cs" - -card "AirWay 802.11 Adapter (PCMCIA)" - #version "AirWay", "802.11 Adapter (PCMCIA)" - manfid 0x0261, 0x0002 - bind "hostap_cs" - -card "Asus SpaceLink WL110" - manfid 0x02aa,0x0002 - bind "hostap_cs" - -## handhelds.org bug 964 -card "Belkin F5D6060 Ethernet" - #version "PCMCIA", "11M WLAN Card v2.5", "ISL37300P", "RevA" - manfid 0x0274, 0x1612 - bind "hostap_cs" - -card "Compaq 11Mbps Wireless PC Card" - manfid 0x028a, 0x0002 - bind "hostap_cs" - -card "Compaq WL100 11 Mbps Wireless Adapter" - manfid 0x0138, 0x0002 - bind "hostap_cs" - -card "Compaq HNW-100 11 Mbps Wireless Adapter" - manfid 0x028a, 0x0002 - bind "hostap_cs" - -card "D-Link DWL-650" - version "D", "Link DWL-650 11Mbps WLAN Card" - bind "hostap_cs" - -card "D-Link DRC-650" - version "D", "Link DRC-650 11Mbps WLAN Card" - bind "hostap_cs" - -card "D-Link DCF660" - manfid 0xd601, 0x0005 - bind "hostap_cs" - -card "Farallon SkyLINE" - version "INTERSIL", "HFA384x/IEEE" - bind "hostap_cs" - -card "HyperLink Wireless PC Card 11Mbps" - version "HyperLink", "Wireless PC Card 11Mbps" - bind "hostap_cs" - -# card "Intersil PRISM2 11 Mbps Wireless Adapter" -# manfid 0x0156, 0x0002 -# bind "hostap_cs" - -card "LA4111 Spectrum24 Wireless LAN PC Card" - version "Symbol Technologies" - bind "hostap_cs" - -card "Linksys WPC11 11Mbps 802.11b WLAN Card" - version "Instant Wireless ", " Network PC CARD", "Version 01.02" - bind "hostap_cs" - -card "Linksys WCF11 11Mbps 802.11b WLAN Card" - manfid 0x0274, 0x3301 - bind "hostap_cs" - -## handhelds.org bug #790 -card "Linksys Wireless CompactFlash Card WCF12" - manfid 0x028a, 0x0673 - bind "hostap_cs" - -card "Linksys WLAN CF Card" - manfid 0x0274, 0x3301 - bind "hostap_cs" - -card "NETGEAR MA701 Wireless CF Card" - manfid 0xd601, 0x0002 - bind "hostap_cs" - -card "Nortel Networks eMobility 802.11 Wireless Adapter" - manfid 0x01eb, 0x080a - bind "hostap_cs" - -card "PLANEX GeoWave GW-CF110" - version "PLANEX", "GeoWave/GW-CF110" - bind "hostap_cs" - -card "PROXIM LAN PC CARD HARMONY 80211B" - version "PROXIM", "LAN PC CARD HARMONY 80211B" - bind "hostap_cs" - -card "Proxim RangeLAN/DS" - version "PROXIM","RangeLAN-DS/LAN PC CARD" - manfid 0x0126, 0x8000 - bind "hostap_cs" - -card "Safeway 802.11b Wireless Adapter" - manfid 0xd601, 0x0002 - bind "hostap_cs" - -card "SAMSUNG 11Mbps WLAN Card" - version "SAMSUNG", "11Mbps WLAN Card" - bind "hostap_cs" - -# needs firmware upload via hostap_fw_load -card "SanDisk ConnectPlus OEM (0MB)" - manfid 0xd601, 0x0010 - bind "hostap_cs" - -# needs special activation (>=hostap 0.3.2 only) plus firmware upload -card "SanDisk ConnectPlus w/ Memory" - version "SanDisk", "ConnectPlus" - manfid 0xd601, 0x0101 - bind "hostap_cs" to 0 -# bind "ide-cs" to 1 - -card "Senao/Origo 80211b WLAN Card" - manfid 0x000b,0x7100 - bind "hostap_cs" - -card "Sitecom WL-007 WLAN CF Card" - manfid 0xd601, 0x0004 - bind "hostap_cs" - -card "SMC2632 802.11 (prism2) Card" - version "SMC", "SMC2632W", "Version 01.02", "" - bind "hostap_cs" - -card "SpeedStream SS1021 Wireless Adapter" - #version "Siemens", "SpeedStream Wireless PCMCIA" - manfid 0x02ac, 0x0002 - bind "hostap_cs" - -card "ZCOMAX AirRunner/XI-300" - #version "ZCOMAX", "AirRunner/XI-300" - manfid 0xd601, 0x0002 - bind "hostap_cs" - -card "Zonet ZCF1100" - manfid 0x000b, 0x7100 - bind "hostap_cs" - -card "Wireless LAN Adapter Version 01.02" - version "Wireless", "LAN Adapter", "Version 01.02" -# manfid 0x0156, 0x0002 - bind "hostap_cs" - -card "Ambicom WL1100C 11Mbs Card 802.11b" - version "AmbiCom", "WL1100C 802.11b CF-Card", "2.2" - manfid 0xd601,0x0002 - bind "hostap_cs" - -card "Ambicom WL1100C 11Mbs Card 802.11b" - manfid 0xd601,0x0002 - bind "hostap_cs" - -card "Sandisk Connect SDWCFB-000" - manfid 0xd601,0x0005 - bind "hostap_cs" - -# Cards with Intersil firmware (Prism chipset) - -card "Linksys WPC11 11Mbps 802.11b WLAN Card" - version "The Linksys Group, Inc.", "Instant Wireless Network PC Card", "ISL37300P", "RevA" - bind "hostap_cs" - -card "Linksys CompactFlash Wireless Card" - version "Linksys", "Wireless CompactFlash Card" - bind "hostap_cs" - -card "ACTIONTEC PRISM Wireless LAN PC Card" - version "ACTIONTEC", "PRISM Wireless LAN PC Card" - bind "hostap_cs" - -card "Linksys WPC11 Version 3" - manfid 0x0274,0x1613 - bind "hostap_cs" - -card "BENQ AWL100" - version "BENQ", "AWL100 PCMCIA ADAPTER" - bind "hostap_cs" - -card "Pretec WLAN" - version "Pretec", "CompactWLAN Card 802.11b", "2.5" - manfid 0x0156, 0x0002 - bind "hostap_cs" - -card "TrendNet TEW PC16" - manfid 0x0274, 0x1601 - bind "hostap_cs" diff --git a/import-layers/yocto-poky/meta/recipes-bsp/hostap/files/hostap_cs.conf-upstream b/import-layers/yocto-poky/meta/recipes-bsp/hostap/files/hostap_cs.conf-upstream deleted file mode 100644 index 5b7385a7c..000000000 --- a/import-layers/yocto-poky/meta/recipes-bsp/hostap/files/hostap_cs.conf-upstream +++ /dev/null @@ -1,191 +0,0 @@ -device "hostap_cs" - class "network" module "hostap", "hostap_cs" - -card "Intersil PRISM2 Reference Design 11Mb/s WLAN Card" - version "INTERSIL", "HFA384x/IEEE" - bind "hostap_cs" - -card "Compaq WL100 11Mb/s WLAN Card" - manfid 0x0138, 0x0002 - bind "hostap_cs" - -card "Compaq WL200" - version "Compaq", "WL200_11Mbps_Wireless_PCI_Card" - bind "hostap_cs" - -card "EMTAC A2424i 11Mbps WLAN Card" - manfid 0xc250, 0x0002 -# cis "cis/Emtac.dat" - bind "hostap_cs" - -card "Linksys WPC11 11Mbps WLAN Card" - version "Instant Wireless ", " Network PC CARD", "Version 01.02" - bind "hostap_cs" - -card "Linksys WPC11 Ver 2.5 11Mbps WLAN Card" - manfid 0x0274, 0x1612 - bind "hostap_cs" - -card "Linksys WPC11 Ver 3 11Mbps WLAN Card" - manfid 0x0274, 0x1613 - bind "hostap_cs" - -card "Linksys WCF12 Wireless CompactFlash Card" - version "Linksys", "Wireless CompactFlash Card" - bind "hostap_cs" - -card "D-Link DWL-650 11Mbps WLAN Card" - version "D", "Link DWL-650 11Mbps WLAN Card", "Version 01.02" - bind "hostap_cs" - -card "D-Link DRC-650 11Mbps WLAN Card" -# version "D", "Link DRC-650 11Mbps WLAN Card", "Version 01.02" - manfid 0x028a, 0x0002 - bind "hostap_cs" - -card "ZoomAir 4100 11Mb/s WLAN Card" - version "ZoomAir 11Mbps High", "Rate wireless Networking" - bind "hostap_cs" - -card "Addtron AWP-100 11Mbps WLAN Card" - version "Addtron", "AWP-100 Wireless PCMCIA", "Version 01.02" - bind "hostap_cs" - -card "Samsung SWL2000-N 11Mb/s WLAN Card" - manfid 0x0250, 0x0002 - bind "hostap_cs" - -card "SMC 2632W 11Mbps WLAN Card" - version "SMC", "SMC2632W", "Version 01.02" - bind "hostap_cs" - -card "BroMax Freeport 11Mbps WLAN Card" - version "Intersil", "PRISM 2_5 PCMCIA ADAPTER", "ISL37300P", "Eval-RevA" - bind "hostap_cs" - -card "Z-Com XI300 11Mb/s WLAN Card" - manfid 0xd601, 0x0002 - bind "hostap_cs" - -card "Zcomax XI-325H 200mW" -# version " ", "IEEE 802.11 Wireless LAN/PC Card" - manfid 0xd601, 0x0005 - bind "hostap_cs" - -card "3Com AirConnect PCI 777A" - manfid 0x0101, 0x0777 - bind "hostap_cs" - -card "U.S. Robotics IEEE 802.11b PC-CARD" - version "U.S. Robotics", "IEEE 802.11b PC-CARD", "Version 01.02" -# manfid 0x0156, 0x0002 - bind "hostap_cs" - -card "Longshine LCR-8531 11Mbps WLAN PCMCIA CARD" - version "OEM", "PRISM2 IEEE 802.11 PC-Card", "Version 01.02" -# manfid 0x0156, 0x0002 - bind "hostap_cs" - -card "Philips 802.11b WLAN PCMCIA" - manfid 0x000b, 0x7300 - bind "hostap_cs" - -card "Proxim RangeLAN" -# version "PROXIM", "RangeLAN-DS/LAN PC CARD" - manfid 0x0126, 0x8000 - bind "hostap_cs" - -card "Buffalo WLI-CF-S11G" - version "BUFFALO", "WLI-CF-S11G" -# manfid 0x026f, 0x030b - bind "hostap_cs" - -card "Level-One WPC-0100" - version "Digital Data Communications", "WPC-0100", "Version 00.00" - manfid 0x0156, 0x0002 - bind "hostap_cs" - -card "Belkin 802.11b WLAN PCMCIA" - version "Belkin", "11Mbps Wireless Notebook Network Adapter", "Version 01.02" - manfid 0x0156, 0x0002 - bind "hostap_cs" - -card "Senao SL-2011CD/SL-2011CDPLUS" - version "INTERSIL", "HFA384x/IEEE", "Version 01.02" - manfid 0x0156, 0x0002 - bind "hostap_cs" - -card "Fulbond Airbond XI-300B" - version " ", "IEEE 802.11 Wireless LAN/PC Card" - manfid 0xd601, 0x0002 - bind "hostap_cs" - -card "Netgear MA401" - version "NETGEAR MA401 Wireless PC", "Card", "Version 01.00" -# manfid 0x0156, 0x0002 - bind "hostap_cs" - -card "D-Link DWL-650 Rev. P1" - version "D-Link", "DWL-650 Wireless PC Card RevP", "ISL37101P-10", "A3" -# manfid 0x000b, 0x7110 - bind "hostap_cs" - -card "SonicWALL Long Range Wireless Card" - version "SonicWALL", "Long Range Wireless Card", "ISL37100P", "1.0" - manfid 0x000b, 0x7100 - bind "hostap_cs" - -card "Senao NL-2011CD PLUS Ext2 Mercury" - version "WLAN", "11Mbps_PC-Card_3.0", "ISL37100P", "Eval-RevA" - manfid 0x000b, 0x7100 - bind "hostap_cs" - -card "Airvast WL100" - version "AIRVAST", "IEEE 802.11b Wireless PCMCIA Card", "HFA3863" - manfid 0x50c2, 0x0001 - bind "hostap_cs" - -card "Microsoft Wireless Notebook Adapter MN-520 1.0.3" - version "Microsoft", "Wireless Notebook Adapter MN-520", "", "1.0.3" - manfid 0x02d2, 0x0001 - bind "hostap_cs" - -card "NETGEAR MA401RA" - version "NETGEAR MA401RA Wireless PC", "Card", "ISL37300P", "Eval-RevA" - manfid 0x000b, 0x7300 - bind "hostap_cs" - -card "Allied Telesyn AT-WCL452" - version "Allied Telesyn", "AT-WCL452 Wireless PCMCIA Radio", "Ver. 1.00" - manfid 0xc00f, 0x0000 - bind "hostap_cs" - -card "corega WL PCCL-11" - version "corega", "WL PCCL-11", "ISL37300P", "RevA" - manfid 0xc00f, 0x0000 - bind "hostap_cs" - -card "SanDisk ConnectPlus" - version "SanDisk", "ConnectPlus" - manfid 0xd601, 0x0101 - bind "hostap_cs" to 0 - bind "ide-cs" to 1 - -card "ASUS WL-100 8011b WLAN PC Card" - version "ASUS", "802_11b_PC_CARD_25", "Version 01.00" - manfid 0x02aa, 0x0002 - bind "hostap_cs" - -card "ZyXel Zyair B-101 802.11b WLAN card" - version " ", "IEEE 802.11 Wireless LAN/PC Card" - manfid 0xd601, 0x0010 - bind "hostap_cs" - -card "WLAN PRISM PCMCIA CARD 37300P RevB6" - version "WLAN", "PRISM PCMCIA CARD", "37300P", "Revision B6" - manfid 0x50c2, 0x7300 - bind "hostap_cs" - - -# Optional configuration parameters for hostap_cs.o -# module "hostap_cs" opts "channel=3 iw_mode=3 essid=test ignore_cis_vcc=0" diff --git a/import-layers/yocto-poky/meta/recipes-bsp/hostap/files/hostap_cs.modalias b/import-layers/yocto-poky/meta/recipes-bsp/hostap/files/hostap_cs.modalias deleted file mode 100644 index 284835151..000000000 --- a/import-layers/yocto-poky/meta/recipes-bsp/hostap/files/hostap_cs.modalias +++ /dev/null @@ -1,28 +0,0 @@ -# product info: "Pretec", "CompactWLAN Card 802.11b", "2.5" -alias pcmcia:m0156c0002f06fn00pfn00pa1CADD3E5pbE697636Cpc7A5BFCF1pd00000000 hostap_cs - -# manufacturer ID which exist in orinoco_cs AND in hostap_cs -alias pcmcia:m000Bc7100f06fn00pfn00pa*pb*pc*pd* hostap_cs -alias pcmcia:m000Bc7300f06fn00pfn00pa*pb*pc*pd* hostap_cs -alias pcmcia:m0126c8000f06fn00pfn00pa*pb*pc*pd* hostap_cs -alias pcmcia:m0138c0002f06fn00pfn00pa*pb*pc*pd* hostap_cs -alias pcmcia:m0250c0002f06fn00pfn00pa*pb*pc*pd* hostap_cs -alias pcmcia:m0274c1612f06fn00pfn00pa*pb*pc*pd* hostap_cs -alias pcmcia:m0274c1613f06fn00pfn00pa*pb*pc*pd* hostap_cs -alias pcmcia:m028Ac0002f06fn00pfn00pa*pb*pc*pd* hostap_cs -alias pcmcia:m02AAc0002f06fn00pfn00pa*pb*pc*pd* hostap_cs -alias pcmcia:m50C2c7300f06fn00pfn00pa*pb*pc*pd* hostap_cs -alias pcmcia:mD601c0002f06fn00pfn00pa*pb*pc*pd* hostap_cs -alias pcmcia:mD601c0005f06fn00pfn00pa*pb*pc*pd* hostap_cs - -# product info: "Linksys", "Wireless CompactFlash Card", "", "" -alias pcmcia:m028Ac0673f06fn00pfn00pa0733CC81pb0C52F395pc00000000pd00000000 hostap_cs - -# product info:"PLANEX COMMUNICATION INC","PLANEX GW-CF11X Wireless CF Card", "", "" -alias pcmcia:mD601c0010f06fn00pfn00pa4703CF68pbFAD7318Dpc00000000pd00000000 hostap_cs - -# 0x0156, 0x0002 and "Version 01.02" only appear for Prism based cards. -alias pcmcia:m0156c0002f06fn00pfn00pa*pb*pc4B74BAA0pd00000000 hostap_cs - -# "BUFFALO", "WLI-CF-S11G", "", "" -alias pcmcia:m026Fc030Bf06fn00pfn00pa2DECECE3pb82067C18pc00000000pd00000000 hostap_cs diff --git a/import-layers/yocto-poky/meta/recipes-bsp/hostap/hostap-conf_1.0.bb b/import-layers/yocto-poky/meta/recipes-bsp/hostap/hostap-conf_1.0.bb deleted file mode 100644 index e1d4c5477..000000000 --- a/import-layers/yocto-poky/meta/recipes-bsp/hostap/hostap-conf_1.0.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Configuration files for HostAP (wifi) driver" -DESCRIPTION = "PCMCIA-cs configuration files for wireless LAN cards based on Intersil's Prism2/2.5/3 chipset." -SECTION = "kernel/modules" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" -PR = "r15" - -SRC_URI = "file://hostap_cs.modalias \ - file://COPYING.patch" - -inherit allarch - -S = "${WORKDIR}" - -do_compile() { -} - -do_install() { - install -d ${D}${sysconfdir}/modprobe.d - - install -m 0644 ${WORKDIR}/hostap_cs.modalias ${D}${sysconfdir}/modprobe.d/hostap_cs.conf -} - diff --git a/import-layers/yocto-poky/meta/recipes-bsp/hostap/hostap-utils-0.4.7/0001-Define-_u32-__s32-__u16-__s16-__u8-in-terms-of-c99-t.patch b/import-layers/yocto-poky/meta/recipes-bsp/hostap/hostap-utils-0.4.7/0001-Define-_u32-__s32-__u16-__s16-__u8-in-terms-of-c99-t.patch deleted file mode 100644 index b44dca3ec..000000000 --- a/import-layers/yocto-poky/meta/recipes-bsp/hostap/hostap-utils-0.4.7/0001-Define-_u32-__s32-__u16-__s16-__u8-in-terms-of-c99-t.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 742fb110d9841a04b3ced256b0bf80ff304dcaff Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 31 Aug 2015 05:45:08 +0000 -Subject: [PATCH] Define _u32/__s32/__u16/__s16/__u8 in terms of c99 types - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - wireless_copy.h | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/wireless_copy.h b/wireless_copy.h -index 8208258..1171a35 100644 ---- a/wireless_copy.h -+++ b/wireless_copy.h -@@ -86,11 +86,11 @@ - #else - #include <sys/types.h> - #include <net/if.h> --typedef __uint32_t __u32; --typedef __int32_t __s32; --typedef __uint16_t __u16; --typedef __int16_t __s16; --typedef __uint8_t __u8; -+typedef u_int32_t __u32; -+typedef int32_t __s32; -+typedef u_int16_t __u16; -+typedef int16_t __s16; -+typedef u_int8_t __u8; - #ifndef __user - #define __user - #endif /* __user */ --- -2.5.1 - diff --git a/import-layers/yocto-poky/meta/recipes-bsp/hostap/hostap-utils-0.4.7/ldflags.patch b/import-layers/yocto-poky/meta/recipes-bsp/hostap/hostap-utils-0.4.7/ldflags.patch deleted file mode 100644 index 3e99d0d92..000000000 --- a/import-layers/yocto-poky/meta/recipes-bsp/hostap/hostap-utils-0.4.7/ldflags.patch +++ /dev/null @@ -1,27 +0,0 @@ -Obey LDFLAGS - -Signed-off-by: Christopher Larson <chris_larson@mentor.com> -Upstream-Status: Pending - ---- hostap-utils-0.4.7.orig/Makefile -+++ hostap-utils-0.4.7/Makefile -@@ -14,17 +14,17 @@ prism2_srec.o: prism2_srec.c util.h - hostap_crypt_conf: hostap_crypt_conf.c - - hostap_diag: hostap_diag.o util.o -- $(CC) -o hostap_diag $(CFLAGS) hostap_diag.o util.o -+ $(CC) -o hostap_diag $(CFLAGS) $(LDFLAGS) hostap_diag.o util.o - - hostap_diag.o: hostap_diag.c util.h - - util.o: util.c util.h - - hostap_io_debug: hostap_io_debug.c -- $(CC) -o hostap_io_debug $(CFLAGS) hostap_io_debug.c -+ $(CC) -o hostap_io_debug $(CFLAGS) $(LDFLAGS) hostap_io_debug.c - - hostap_rid: hostap_rid.o util.o -- $(CC) -o hostap_rid $(CFLAGS) hostap_rid.o util.o -+ $(CC) -o hostap_rid $(CFLAGS) $(LDFLAGS) hostap_rid.o util.o - - hostap_rid.o: hostap_rid.c util.h diff --git a/import-layers/yocto-poky/meta/recipes-bsp/hostap/hostap-utils.inc b/import-layers/yocto-poky/meta/recipes-bsp/hostap/hostap-utils.inc deleted file mode 100644 index 6d98e3a88..000000000 --- a/import-layers/yocto-poky/meta/recipes-bsp/hostap/hostap-utils.inc +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "User mode helpers for the hostap driver" -DESCRIPTION = "The hostap driver supports Host AP mode, it allows for IEEE 802.11 \ -management functions on the host computer and allows the system to act as an access point." -HOMEPAGE = "https://w1.fi" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ - file://util.c;beginline=1;endline=9;md5=d3b9280851302e5ba34e5fb717489b6d" -SECTION = "kernel/userland" -PR = "r4" - -SRC_URI = "https://w1.fi/releases/hostap-utils-${PV}.tar.gz \ - file://hostap-fw-load.patch \ - file://0001-Define-_u32-__s32-__u16-__s16-__u8-in-terms-of-c99-t.patch \ -" -S = "${WORKDIR}/hostap-utils-${PV}" - -BINARIES = "hostap_crypt_conf hostap_diag hostap_fw_load hostap_io_debug \ - hostap_rid prism2_param prism2_srec split_combined_hex" - -do_install() { - install -d ${D}${sbindir}/ - for f in ${BINARIES} - do - install -m 0755 $f ${D}${sbindir}/ - done -} - diff --git a/import-layers/yocto-poky/meta/recipes-bsp/hostap/hostap-utils_0.4.7.bb b/import-layers/yocto-poky/meta/recipes-bsp/hostap/hostap-utils_0.4.7.bb deleted file mode 100644 index be5481f6f..000000000 --- a/import-layers/yocto-poky/meta/recipes-bsp/hostap/hostap-utils_0.4.7.bb +++ /dev/null @@ -1,5 +0,0 @@ -require hostap-utils.inc - -SRC_URI += "file://ldflags.patch" -SRC_URI[md5sum] = "afe041581b8f01666e353bec20917c85" -SRC_URI[sha256sum] = "c6f598d8e356c1620fa009eca0a700bf1105e16817eefd77d891994261009355" diff --git a/import-layers/yocto-poky/meta/recipes-bsp/libacpi/files/libacpi_fix_for_x32.patch b/import-layers/yocto-poky/meta/recipes-bsp/libacpi/files/libacpi_fix_for_x32.patch index 86a16c262..06f20e5a7 100644 --- a/import-layers/yocto-poky/meta/recipes-bsp/libacpi/files/libacpi_fix_for_x32.patch +++ b/import-layers/yocto-poky/meta/recipes-bsp/libacpi/files/libacpi_fix_for_x32.patch @@ -3,9 +3,10 @@ Upstream-Status: Pending Fix libacpi for x32 libacpi doesn't use base_libdir for install. This patch adds - base_libdir support so that x32 libraries are installed properly. + libdir support so that x32 libraries are installed properly. Patch Received from: H.J. Lu <hjl.tools@gmail.com> +Updated by: Ricardo Salveti <ricardo@opensourcefoundries.com> 2018/02/03 Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/05 @@ -13,18 +14,7 @@ Index: libacpi-0.2/Makefile =================================================================== --- libacpi-0.2.orig/Makefile +++ libacpi-0.2/Makefile -@@ -8,6 +8,10 @@ SRC_test = test-libacpi.c libacpi.c list - OBJ = ${SRC:.c=.o} - OBJ_test = ${SRC_test:.c=.o} - -+ifndef base_libdir -+base_libdir=/lib -+endif -+ - all: options libacpi.a libacpi.so test-libacpi - - options: -@@ -42,13 +46,13 @@ install: all +@@ -42,13 +42,13 @@ install: all @mkdir -p ${DESTDIR}${PREFIX}/include @cp -f libacpi.h ${DESTDIR}${PREFIX}/include @chmod 644 ${DESTDIR}${PREFIX}/include/libacpi.h @@ -35,13 +25,13 @@ Index: libacpi-0.2/Makefile - @cp -f ${SONAME} ${DESTDIR}${PREFIX}/lib/ - @chmod 644 ${DESTDIR}${PREFIX}/lib/${SONAME} - @ln -s ${SONAME} ${DESTDIR}${PREFIX}/lib/libacpi.so -+ @echo installing library to ${DESTDIR}${PREFIX}${base_libdir} -+ @mkdir -p ${DESTDIR}${PREFIX}${base_libdir} -+ @cp -f libacpi.a ${DESTDIR}${PREFIX}${base_libdir} -+ @chmod 644 ${DESTDIR}${PREFIX}${base_libdir}/libacpi.a -+ @cp -f ${SONAME} ${DESTDIR}${PREFIX}${base_libdir}/ -+ @chmod 644 ${DESTDIR}${PREFIX}${base_libdir}/${SONAME} -+ @ln -s ${SONAME} ${DESTDIR}${PREFIX}${base_libdir}/libacpi.so ++ @echo installing library to ${DESTDIR}${LIBDIR} ++ @mkdir -p ${DESTDIR}${LIBDIR} ++ @cp -f libacpi.a ${DESTDIR}${LIBDIR} ++ @chmod 644 ${DESTDIR}${LIBDIR}/libacpi.a ++ @cp -f ${SONAME} ${DESTDIR}${LIBDIR}/ ++ @chmod 644 ${DESTDIR}${LIBDIR}/${SONAME} ++ @ln -s ${SONAME} ${DESTDIR}${LIBDIR}/libacpi.so @echo installing test-libacpi to ${DESTDIR}${PREFIX}/bin @mkdir -p ${DESTDIR}${PREFIX}/bin @cp -f test-libacpi ${DESTDIR}${PREFIX}/bin diff --git a/import-layers/yocto-poky/meta/recipes-bsp/libacpi/libacpi_0.2.bb b/import-layers/yocto-poky/meta/recipes-bsp/libacpi/libacpi_0.2.bb index 6dc66ea25..5e7f7fa8e 100644 --- a/import-layers/yocto-poky/meta/recipes-bsp/libacpi/libacpi_0.2.bb +++ b/import-layers/yocto-poky/meta/recipes-bsp/libacpi/libacpi_0.2.bb @@ -28,5 +28,5 @@ EXTRA_OEMAKE = '-e MAKEFLAGS= STRIP="echo"' TARGET_CC_ARCH += "${LDFLAGS}" do_install() { - oe_runmake install DESTDIR=${D} PREFIX=${exec_prefix} + oe_runmake install DESTDIR=${D} PREFIX=${exec_prefix} LIBDIR=${libdir} } diff --git a/import-layers/yocto-poky/meta/recipes-bsp/pciutils/pciutils/configure.patch b/import-layers/yocto-poky/meta/recipes-bsp/pciutils/pciutils/configure.patch index 55edfea3f..a7e445733 100644 --- a/import-layers/yocto-poky/meta/recipes-bsp/pciutils/pciutils/configure.patch +++ b/import-layers/yocto-poky/meta/recipes-bsp/pciutils/pciutils/configure.patch @@ -13,11 +13,11 @@ Ionut Radu <ionutx.radu@intel.com> Upstream-Status: Inappropriate [embedded specific] -Index: pciutils-3.5.4/Makefile +Index: pciutils-3.5.6/Makefile =================================================================== ---- pciutils-3.5.4.orig/Makefile -+++ pciutils-3.5.4/Makefile -@@ -96,7 +95,7 @@ example: example.o lib/$(PCILIB) +--- pciutils-3.5.6.orig/Makefile ++++ pciutils-3.5.6/Makefile +@@ -96,7 +96,7 @@ example: example.o lib/$(PCILIB) example.o: example.c $(PCIINC) %: %.o @@ -26,12 +26,12 @@ Index: pciutils-3.5.4/Makefile %.8 %.7: %.man M=`echo $(DATE) | sed 's/-01-/-January-/;s/-02-/-February-/;s/-03-/-March-/;s/-04-/-April-/;s/-05-/-May-/;s/-06-/-June-/;s/-07-/-July-/;s/-08-/-August-/;s/-09-/-September-/;s/-10-/-October-/;s/-11-/-November-/;s/-12-/-December-/;s/\(.*\)-\(.*\)-\(.*\)/\3 \2 \1/'` ; sed <$< >$@ "s/@TODAY@/$$M/;s/@VERSION@/pciutils-$(VERSION)/;s#@IDSDIR@#$(IDSDIR)#" -Index: pciutils-3.5.4/lib/configure +Index: pciutils-3.5.6/lib/configure =================================================================== ---- pciutils-3.5.4.orig/lib/configure -+++ pciutils-3.5.4/lib/configure -@@ -14,6 +14,10 @@ echo_n() { - fi +--- pciutils-3.5.6.orig/lib/configure ++++ pciutils-3.5.6/lib/configure +@@ -9,6 +9,10 @@ echo_n() { + printf '%s' "$*" } +VERSION=$1 @@ -41,7 +41,7 @@ Index: pciutils-3.5.4/lib/configure if [ -z "$VERSION" -o -z "$IDSDIR" ] ; then echo >&2 "Please run the configure script from the top-level Makefile" exit 1 -@@ -21,8 +25,8 @@ fi +@@ -16,8 +20,8 @@ fi echo_n "Configuring libpci for your system..." if [ -z "$HOST" ] ; then @@ -52,7 +52,7 @@ Index: pciutils-3.5.4/lib/configure realsys="$sys" if [ "$sys" = "AIX" -a -x /usr/bin/oslevel -a -x /usr/sbin/lsattr ] then -@@ -30,7 +34,7 @@ if [ -z "$HOST" ] ; then +@@ -25,7 +29,7 @@ if [ -z "$HOST" ] ; then proc=`/usr/sbin/lsdev -C -c processor -S available -F name | head -1` cpu=`/usr/sbin/lsattr -F value -l $proc -a type | sed 's/_.*//'` else @@ -61,7 +61,7 @@ Index: pciutils-3.5.4/lib/configure fi if [ "$sys" = "GNU/kFreeBSD" -o "$sys" = "DragonFly" ] then -@@ -40,7 +44,7 @@ if [ -z "$HOST" ] ; then +@@ -35,7 +39,7 @@ if [ -z "$HOST" ] ; then then sys=cygwin fi @@ -70,7 +70,7 @@ Index: pciutils-3.5.4/lib/configure fi [ -n "$RELEASE" ] && rel="${RELEASE}" # CAVEAT: tr on Solaris is a bit weird and the extra [] is otherwise harmless. -@@ -49,6 +53,8 @@ cpu=`echo $host | sed 's/^\([^-]*\)-\([^ +@@ -44,6 +48,8 @@ cpu=`echo $host | sed 's/^\([^-]*\)-\([^ sys=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo " $host $rel $cpu $sys" diff --git a/import-layers/yocto-poky/meta/recipes-bsp/pciutils/pciutils_3.5.5.bb b/import-layers/yocto-poky/meta/recipes-bsp/pciutils/pciutils_3.5.6.bb index 0051fd876..b18b7da3e 100644 --- a/import-layers/yocto-poky/meta/recipes-bsp/pciutils/pciutils_3.5.5.bb +++ b/import-layers/yocto-poky/meta/recipes-bsp/pciutils/pciutils_3.5.6.bb @@ -11,8 +11,8 @@ DEPENDS = "zlib kmod" SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.xz \ file://configure.patch" -SRC_URI[md5sum] = "238d9969cc0de8b9105d972007d9d546" -SRC_URI[sha256sum] = "1d62f8fa192f90e61c35a6fc15ff3cb9a7a792f782407acc42ef67817c5939f5" +SRC_URI[md5sum] = "8e52278399b7b35fcfc031bc05da80a8" +SRC_URI[sha256sum] = "f346eeb90cce0910c05b877fe49eadc760fa084c0455fd313e39d4b2c2d4bb21" inherit multilib_header pkgconfig diff --git a/import-layers/yocto-poky/meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_race.patch b/import-layers/yocto-poky/meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_race.patch index f5a518ff7..4c5eba795 100644 --- a/import-layers/yocto-poky/meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_race.patch +++ b/import-layers/yocto-poky/meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_race.patch @@ -16,20 +16,6 @@ Index: pcmciautils-018/Makefile =================================================================== --- pcmciautils-018.orig/Makefile +++ pcmciautils-018/Makefile -@@ -249,6 +249,9 @@ $(PCMCIA_SOCKET_STARTUP): $(LIBC) src/st - yacc_config.o lex_config.o: %.o: %.c src/yacc_config.h - $(CC) -c -MD -O -pipe $(CPPFLAGS) $< - -+src/lex_config.o : src/lex_config.c src/yacc_config.h -+ $(QUIET) $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< -+ - debugtools: ccdv $(CBDUMP) $(CISDUMP) - - $(CBDUMP): $(LIBC) debug/cbdump.o -Index: pcmciautils-018/Makefile -=================================================================== ---- pcmciautils-018.orig/Makefile -+++ pcmciautils-018/Makefile @@ -246,8 +246,8 @@ $(PCMCIA_SOCKET_STARTUP): $(LIBC) src/st $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) src/startup.o src/yacc_config.o src/lex_config.o $(LIB_OBJS) $(ARCH_LIB_OBJS) $(QUIET) $(STRIPCMD) $@ diff --git a/import-layers/yocto-poky/meta/recipes-bsp/u-boot/files/10m50-update-device-tree.patch b/import-layers/yocto-poky/meta/recipes-bsp/u-boot/files/10m50-update-device-tree.patch deleted file mode 100644 index 841953cd1..000000000 --- a/import-layers/yocto-poky/meta/recipes-bsp/u-boot/files/10m50-update-device-tree.patch +++ /dev/null @@ -1,28 +0,0 @@ -Nios II for MAX10 10m50 board requires update to -its device tree to enable CPU driver during -u-boot pre-relocation. This patch tag the CPU -with dm-pre-reloc flag. - -Upstream-Status: Submitted - -Signed-off-by: Gan, Yau Wai <yau.wai.gan@intel.com> - ---- - arch/nios2/dts/10m50_devboard.dts | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/nios2/dts/10m50_devboard.dts b/arch/nios2/dts/10m50_devboard.dts -index 05eac30..461ae68 100644 ---- a/arch/nios2/dts/10m50_devboard.dts -+++ b/arch/nios2/dts/10m50_devboard.dts -@@ -19,6 +19,7 @@ - #size-cells = <0>; - - cpu: cpu@0 { -+ u-boot,dm-pre-reloc; - device_type = "cpu"; - compatible = "altr,nios2-1.1"; - reg = <0x00000000>; --- -2.7.4 - diff --git a/import-layers/yocto-poky/meta/recipes-bsp/u-boot/files/MPC8315ERDB-enable-DHCP.patch b/import-layers/yocto-poky/meta/recipes-bsp/u-boot/files/MPC8315ERDB-enable-DHCP.patch index cea52b79e..ecaa1796a 100644 --- a/import-layers/yocto-poky/meta/recipes-bsp/u-boot/files/MPC8315ERDB-enable-DHCP.patch +++ b/import-layers/yocto-poky/meta/recipes-bsp/u-boot/files/MPC8315ERDB-enable-DHCP.patch @@ -5,15 +5,15 @@ Upstream-Status: Pending Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> -diff --git a/configs/MPC8315ERDB_defconfig b/configs/MPC8315ERDB_defconfig -index 4e2b705..b02ab1f 100644 ---- a/configs/MPC8315ERDB_defconfig -+++ b/configs/MPC8315ERDB_defconfig -@@ -9,6 +9,7 @@ CONFIG_HUSH_PARSER=y - CONFIG_CMD_I2C=y +Index: git/configs/MPC8315ERDB_defconfig +=================================================================== +--- git.orig/configs/MPC8315ERDB_defconfig ++++ git/configs/MPC8315ERDB_defconfig +@@ -12,6 +12,7 @@ CONFIG_CMD_PCI=y + CONFIG_CMD_SATA=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y - CONFIG_CMD_EXT2=y + CONFIG_CMD_DATE=y diff --git a/import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot-common_2017.09.inc b/import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot-common_2018.01.inc index 02e51242c..d2073ea0c 100644 --- a/import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot-common_2017.09.inc +++ b/import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot-common_2018.01.inc @@ -7,11 +7,10 @@ PE = "1" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "c98ac3487e413c71e5d36322ef3324b21c6f60f9" +SRCREV = "f3dd87e0b98999a78e500e8c6d2b063ebadf535a" SRC_URI = "git://git.denx.de/u-boot.git \ file://MPC8315ERDB-enable-DHCP.patch \ - file://10m50-update-device-tree.patch \ " S = "${WORKDIR}/git" diff --git a/import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.09.bb b/import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.01.bb index 02887a138..02887a138 100644 --- a/import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.09.bb +++ b/import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.01.bb diff --git a/import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot-mkimage_2017.09.bb b/import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot-mkimage_2018.01.bb index f1fc56449..1c008be96 100644 --- a/import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot-mkimage_2017.09.bb +++ b/import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot-mkimage_2018.01.bb @@ -24,4 +24,6 @@ do_install () { ln -sf uboot-mkimage ${D}${bindir}/mkimage } +RDEPENDS_${PN} += "dtc" + BBCLASSEXTEND = "native nativesdk" diff --git a/import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot_2017.09.bb b/import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot_2018.01.bb index 37c21dcaa..37c21dcaa 100644 --- a/import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot_2017.09.bb +++ b/import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot_2018.01.bb diff --git a/import-layers/yocto-poky/meta/recipes-bsp/usbutils/usbutils/Fix-NULL-pointer-crash.patch b/import-layers/yocto-poky/meta/recipes-bsp/usbutils/usbutils/Fix-NULL-pointer-crash.patch deleted file mode 100644 index 0efdc59fc..000000000 --- a/import-layers/yocto-poky/meta/recipes-bsp/usbutils/usbutils/Fix-NULL-pointer-crash.patch +++ /dev/null @@ -1,28 +0,0 @@ -Fix NULL pointer crash. - -Before use usbbuslist, we should check if it is valid. - -Upstream-Status: Pending -Signed-off-by: Roy.Li <rongqing.li@windriver.com> ---- - lsusb-t.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/lsusb-t.c b/lsusb-t.c -index f604155..583a46a 100644 ---- a/lsusb-t.c -+++ b/lsusb-t.c -@@ -643,6 +643,10 @@ static void sort_busses(void) - /* need to reverse sort bus numbers */ - struct usbbusnode *t, *p, **pp; - int swapped; -+ -+ if (!usbbuslist) -+ return; -+ - do { - p = usbbuslist; - pp = &usbbuslist; --- -1.7.4.1 - diff --git a/import-layers/yocto-poky/meta/recipes-bsp/usbutils/usbutils/iconv.patch b/import-layers/yocto-poky/meta/recipes-bsp/usbutils/usbutils/iconv.patch deleted file mode 100644 index 645556717..000000000 --- a/import-layers/yocto-poky/meta/recipes-bsp/usbutils/usbutils/iconv.patch +++ /dev/null @@ -1,41 +0,0 @@ -This patch adds support for detecting iconv support using autotools -uclibc does not have iconv implementation inside libc like glibc, therefore -the existing checks were not sufficient, it worked for glibc but not for -uclibc. The new patch portably detects the iconv support and adds the -libiconv to linker cmdline - -This patch should be submitted upstream too - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Index: usbutils-008/configure.ac -=================================================================== ---- usbutils-008.orig/configure.ac -+++ usbutils-008/configure.ac -@@ -10,7 +10,9 @@ AC_USE_SYSTEM_EXTENSIONS - AC_SYS_LARGEFILE - - AC_CHECK_HEADERS([byteswap.h]) --AC_CHECK_FUNCS([nl_langinfo iconv]) -+ -+AM_GNU_GETTEXT -+AM_ICONV - - PKG_CHECK_MODULES(LIBUSB, libusb-1.0 >= 1.0.0) - -Index: usbutils-008/Makefile.am -=================================================================== ---- usbutils-008.orig/Makefile.am -+++ usbutils-008/Makefile.am -@@ -29,7 +29,8 @@ lsusb_CPPFLAGS = \ - - lsusb_LDADD = \ - $(LIBUSB_LIBS) \ -- $(UDEV_LIBS) -+ $(UDEV_LIBS) \ -+ $(LIBICONV) - - man_MANS = \ - lsusb.8 \ diff --git a/import-layers/yocto-poky/meta/recipes-bsp/usbutils/usbutils_008.bb b/import-layers/yocto-poky/meta/recipes-bsp/usbutils/usbutils_009.bb index d3c5bd52a..3ffc0dd97 100644 --- a/import-layers/yocto-poky/meta/recipes-bsp/usbutils/usbutils_008.bb +++ b/import-layers/yocto-poky/meta/recipes-bsp/usbutils/usbutils_009.bb @@ -10,16 +10,25 @@ DEPENDS = "libusb zlib virtual/libiconv udev" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \ file://usb-devices-avoid-dependency-on-bash.patch \ - file://Fix-NULL-pointer-crash.patch \ - file://iconv.patch \ " -SRC_URI[md5sum] = "cb20148c2e784577e924a7b4c560c8fb" -SRC_URI[sha256sum] = "6d5f16c2961df37e22e492c736a3e162a8fde24480f23a40d85f79af80d3fe95" +SRC_URI[md5sum] = "b5dbc498b2eb5058f7a57fc6532d0aad" +SRC_URI[sha256sum] = "e73543293a17c7803994eac97a49e58b377e08e6299ba11aad09794b91340e8b" -inherit autotools gettext pkgconfig distro_features_check +inherit autotools pkgconfig distro_features_check update-alternatives + +ALTERNATIVE_${PN} = "lsusb" +ALTERNATIVE_PRIORITY = "100" FILES_${PN}-dev += "${datadir}/pkgconfig" RRECOMMENDS_${PN} = "udev-hwdb" RDEPENDS_${PN}-ptest = "libboost-system libboost-thread" + +PACKAGE_BEFORE_PN =+ "${PN}-python" +FILES_${PN}-python += "${bindir}/lsusb.py" +RDEPENDS_${PN}-python = "python3-core" + +do_install_append() { + sed -i -E '1s,#!.+python,#!${bindir}/python3,' ${D}${bindir}/lsusb.py +} diff --git a/import-layers/yocto-poky/meta/recipes-bsp/v86d/v86d_0.1.10.bb b/import-layers/yocto-poky/meta/recipes-bsp/v86d/v86d_0.1.10.bb index e5f6fff73..f97b80d08 100644 --- a/import-layers/yocto-poky/meta/recipes-bsp/v86d/v86d_0.1.10.bb +++ b/import-layers/yocto-poky/meta/recipes-bsp/v86d/v86d_0.1.10.bb @@ -9,7 +9,7 @@ DEPENDS = "virtual/kernel" RRECOMMENDS_${PN} = "kernel-module-uvesafb" PR = "r2" -SRC_URI = "${DEBIAN_MIRROR}/main/v/${BPN}/${BPN}_${PV}.orig.tar.gz \ +SRC_URI = "http://snapshot.debian.org/archive/debian/20110427T035506Z/pool/main/v/${BPN}/${BPN}_${PV}.orig.tar.gz \ file://Update-x86emu-from-X.org.patch \ file://ar-from-env.patch \ file://aarch64-host.patch \ |