aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2016-04-29recipetool: create: fix falling back to declared license for npm packagesPaul Eggleton
Fix two problems falling back to the "license" field from package.json when no license file is present: 1) The function that was supposed to return the license field value was always explicitly returning None, and this was never noticed (because the test cases never exercised the fallback as they provided license files for each module). 2) Fix the main package not falling back because it had a default of an empty list, which evaluates to '' instead of 'Unknown'. (From OE-Core rev: b157149f0855ccb2cd042e689699acedbf428b92) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29recipetool: create: fix picking up false npm package directoriesPaul Eggleton
It is possible for a Node.js module to have node_modules subdirectories that contain no package.json file (e.g. iotivity-node has such a directory). It appears these should simply be ignored, or else with the way the current code works we will get errors later. (From OE-Core rev: e7cb3ce251d875baf4a4194f6f2cf90aa0c70781) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29arch-armv7ve: inherit armv7a tunes fileDenys Dmytriyenko
armv7a is a subset of armv7ve: https://gcc.gnu.org/onlinedocs/gcc/ARM-Options.html -march=armv7ve is the armv7-a architecture with virtualization extensions. By inheriting armv7a from armv7ve it's possible for e.g. Cortex-A15 machines to include tune-cortexa15.inc and have a full range of optimizations, but set DEFAULTTUNE as "armv7a" to produce binaries compatible with Cortex-A8 machines, etc. (From OE-Core rev: 1bcfb242420540cb4f725498b0dc82a97c2ef728) Signed-off-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29kernel: fitimage: basic support for fitimage signatureYannick Gicquel
This is an initial support of fitImage signature to enable U-Boot verified boot. This feature is implemented by adding a signature tag to the configuration section of the generated fit-image.its file. When a UBOOT_SIGN_ENABLE variable is set to "1", the signature procedure is activated and performs a second call to mkimage to sign the fitImage file and to include the public key in the deployed U-Boot device tree blob. (This implementation depends on the use of CONFIG_OF_SEPARATE in U-Boot.) As the U-Boot device tree blob is appended in the deploy dir, a dependency on 'u-boot:do_deploy' is added when the feature is activated. (From OE-Core rev: 5a2fac922dfd5e7858bb83e76553efd8faa7b579) Signed-off-by: Yannick Gicquel <yannick.gicquel@iot.bzh> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29kernel: fitimage: support device tree compiler optionsYannick Gicquel
This introduces a new variable to set the device tree compiler options while calling mkimage ('-D' option). By default, this variable is not set but it can be defined in a configuration file, as following example: UBOOT_MKIMAGE_DTCOPTS = "-I dts -O dtb -p 2000" (From OE-Core rev: a1b7367a9292cbc5aadd7003b74997736dbe0cc4) Signed-off-by: Yannick Gicquel <yannick.gicquel@iot.bzh> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29u-boot: deploy u-boot-nodtb and dtb filesYannick Gicquel
This enable the deployment of u-boot-nodtb.bin and u-boot.dtb files. (From OE-Core rev: aa332783bebebc45feb5a78a349dc62c3c90b153) Signed-off-by: Yannick Gicquel <yannick.gicquel@iot.bzh> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29u-boot: basic support of dtb append for verified bootYannick Gicquel
This introduces a new uboot-sign.class to support U-Boot verified boot. This part delivers the new class file, with related environment variables, and a new task intended to run before do_install task and which performs the concatenation of the u-boot-nodtb.bin and the device tree blob. The 'cat' command used overrides the u-boot.bin in both DEPLOYDIR & build dir to propagate the changes in later tasks (do_install, do_package, etc.) (From OE-Core rev: aa9bba8cf61d1d63ca37aa76c02541a4dcac6bb8) Signed-off-by: Yannick Gicquel <yannick.gicquel@iot.bzh> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29scripts/lib/argparse_oe: also change 'positional arguments' to 'arguments'Christopher Larson
This aligns with our existing 'optional arguments' to 'options' change, and seems more intuitive for users. (From OE-Core rev: a3619f5fffb8ed4cc635ad9999e15c965c989d68) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29scripts/lib/argparse_oe: simplify options title changeChristopher Larson
There's no need to iterate over the action groups here, as self._optionals and self._positionals are available. (From OE-Core rev: f5bb28e2cda7c3ede40087f940afbd96cd33841d) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29scripts/lib/argparse_oe: show subparser help for unrecognized argsChristopher Larson
As an example, `recipetool create foo bar baz` shows `recipetool: error: unrecognized arguments: bar baz` and then displays the main help, not the help for the create command. Fix by saving the subparser name and using it in parse_args() to look up the subparser. (From OE-Core rev: a57746ce5ce93d45e35a4395cb38443197a32c37) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29scripts/lib/argparse_oe: show self.prog in the error messageChristopher Larson
This aligns our subclassed error() with that in the original class, using _print_message and self.prog. Also add a docstring based on the original. (From OE-Core rev: 9fbf377badfc0f429e642e755a0d1016e29c3017) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29wic: use sparse_copy to preserve sparsenessEd Bartosh
Used sparse_copy API in favor of dd/cp in rawcopy plugin to preserve sparseness of the copied raw content. [YOCTO #9099] (From OE-Core rev: 9f054b016d98c41fb06b0456d5a633048f0aa470) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29wic: use sparse_copy to copy partitionsEd Bartosh
Copied partition images into final partitioned image using sparse_copy API. This method preserves sparseness of the final image. It also makes wic much faster, as unmapped blocks of the partition images are not copied. [YOCTO #9099] (From OE-Core rev: b4c1b0fe0db231d4e5fc226b3b6c55f73cbc8bd7) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29wic: add sparse_copy APIEd Bartosh
In order to make wic images sparse sparse_copy function has been copied from meta-ostro: https://github.com/kad/meta-ostro/blob/master/meta-ostro/lib/image-dsk.py This function uses filemap APIs to copy source sparse file into destination file preserving sparseness. The function has been modified to satisfy wic requirements: parameter 'skip' has been added. [YOCTO #9099] (From OE-Core rev: b63dc111e592b570c19fb65aa7850eaeca953cdd) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29wic: add FIEMAP and SEEK_HOLE / SEEK_DATA APIsEd Bartosh
In order to make wic images sparse set of APIs has been copied from bmap-tools project. filemap.py module is taken from bmap-tools project: https://github.com/01org/bmap-tools/blob/master/bmaptools/Filemap.py It implements two ways of get information about file block: FIEMAP ioctl and the 'SEEK_HOLE / SEEK_DATA' features of the file seek syscall. Note that this module will be removed as soon as bmaptool utility supports copying sparse source file into destination file (this is already agreed with the maintainer of bmap-tools project). [YOCTO #9099] (From OE-Core rev: 5320b6f47106691f23054fcbd8ce7ea0db0e832a) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29wic: moved DiskImage to direct.pyEd Bartosh
Moved DiskImage class from utils/fs_related.py to imager/direct.py as it's only used there. Removed fs_related module as it doesn't contain anything except of DiskImage. (From OE-Core rev: 871ff1fd7bc4fd1b0195a0ff90093a4e1233390e) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29wic: get rid of fs_related.makedirsEd Bartosh
Removed fs_related.makedirs as is not used anywhere. The name is easy to confuse with os.makedirs. (From OE-Core rev: 38ea317a45370c35b2a2dda78c816b8ba94ab3dc) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29wic: get rid of inheritance Disk->DiskImageEd Bartosh
There is no need in this inheritance as DiskImage class is used only in one module and no other classes are inherited. (From OE-Core rev: 28503f7421f72c984022fa490e938290f6ebd037) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29wic: use truncate utility to create sparse filesEd Bartosh
Used truncate instead of dd to create wic images for the following reasons: - dd doesn't preserve sparseness - truncate syntax is much more clear - dd requires additional calculations of the image size in blocks - the way dd was used in the code is not always correct. In some cases it was writing one block to the file which makes it not 100% sparse. [YOCTO #9099] (From OE-Core rev: a2a8fcd54c40ed408662c6c7728122cbc2d02962) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29autotools: add default for CACHED_CONFIGUREVARSRoss Burton
Ensure that this variable has a default value so that we don't get debug messages that the variable couldn't be expanded. (From OE-Core rev: d2a4fccf5a57dd2eb721e248b2fd7a888d4e1c91) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29packagegroup-core-lsb: fix whitespace in meta-qt* warningsJoshua Lock
Without these extra space characters the messages are ill-formatted, i.e: 'The meta-qt3 layer should be added, this layer provides Qt 3.xlibraries. Its intended use is for passing LSB tests as Qt3 isa requirement for LSB.' Changes to: 'The meta-qt3 layer should be added, this layer provides Qt 3.x libraries. Its intended use is for passing LSB tests as Qt3 is a requirement for LSB.' (From OE-Core rev: cd582604baedbe8c3b54692f5945cbc6e5f1fce1) Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29security_flags: turn potential string format security issues into an errorJoshua Lock
Add "-Wformat -Wformat-security -Werror=format-security" to the default SECURITY_CFLAGS to catch potential security vulnerabilities due to the misuse of various string formatting functions. These flags are widely used in distributions such as Fedora and Ubuntu, however we have 15 recipes in OE-Core which fail to build with these flags included and thus the flags are removed for: - busybox - console-tools - cmake - expect - gcc - gettext - kexec-tools - leafpad - libuser - ltp - makedevs - oh-puzzles - stat - unzip - zip [YOCTO #9488] (From OE-Core rev: 672e2231a1c7d1ee8957f0e53c66c75db45a7a07) Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29sysvinit-inittab: restrict labels to 4 charsStephano Cetola
The current recipe creates inittab labels based off the device node name of TTYs used as consoles. If those names exceed the 4 character label limit of inittab, it will break. This change takes the last 4 chars of the device names in order to avoid any errors. [ YOCTO #9529 ] (From OE-Core rev: a13a5503b70367ff9a857a12c2556f99eeb033c7) Signed-off-by: Stephano Cetola <stephano.cetola@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29toolchain-scripts: replace source built-in callStephano Cetola
Some shells (e.g. dash) do not support the source built-in. This replaces it with the dot operator. [ YOCTO #9535 ] (From OE-Core rev: eb835da5867ea6451b7329b965172f4f4843b13f) Signed-off-by: Stephano Cetola <stephano.cetola@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29gstreamer1.0-rtsp-server: upgrade to version 1.8.1Carlos Rafael Giani
(From OE-Core rev: 5db5224b1d56c8dc0a1226ef7f01b9e68ff2d576) Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29gstreamer1.0-libav: upgrade to version 1.8.1Carlos Rafael Giani
(From OE-Core rev: 166aac47d403a0040980bebff966df466eafe66c) Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29gstreamer1.0-plugins-ugly: upgrade to version 1.8.1Carlos Rafael Giani
(From OE-Core rev: 71ebca9165ac95700f116e48fc9994fb37054efd) Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29gstreamer1.0-plugins-bad: upgrade to version 1.8.1Carlos Rafael Giani
0002-glplugin-glwindow-fix-memory-leak-of-navigation-thre.patch is a backport, and is no longer needed. configure-allow-to-disable-libssh2.patch got replaced by a patch that does the same thing but has been submitted. Vulkan is disabled for now since libxcb alone is not enough - the Vulkan headers and libraries are needed as well. (From OE-Core rev: 7224d3eae15bd6d583443f4f09fa3b5000c761ce) Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29gstreamer1.0-plugins-good: upgrade to version 1.8.1Carlos Rafael Giani
(From OE-Core rev: 164c4c82387152310e557d43ccfa15f4275342ee) Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29gstreamer1.0-plugins-base: upgrade to version 1.8.1Carlos Rafael Giani
Patches still apply and only needed their line numbers updated, with the exception of one backport from 1.7.1, which is no longer needed. (From OE-Core rev: b982c73d6837ddd737e90911f1b9fdd2830ca876) Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29gstreamer1.0: upgrade to version 1.8.1Carlos Rafael Giani
The gst-inspect patch no longer applies, and according to upstream, is not needed. (From OE-Core rev: 78ae58c25f8084aab3cba66c9c50b34341f45c3c) Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29poky: Switch to post release name/versionRichard Purdie
(From meta-yocto rev: c9766c66525a0c1b040d1282ecc1c6f41c615dc7) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29poky-tiny: Switch to using kernel 4.4 and busybox for initKhem Raj
busybox based init system is available and used in many other distributions e.g. buildroot, therefore use that combination with mdev gives a scalable image and chance to execute sysvinit scripts as well, adding nothing to image size. (From meta-yocto rev: fb26fae4476c6e4ce281c70d81a416035650ebf6) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29bitbake: bitbake: Switch to post release versionRichard Purdie
(Bitbake rev: 309f5907a3661821e041ed14645b5d165007b058) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29bitbake: fetch2: export DBUS_SESSION_BUS_ADDRESS to support authentication ↵Ross Burton
agents Some users may want to use authenticated SSH connections with credentials stored in a keyring, such as gnome-keyring. These typically need a DBus session bus connection, so pass DBUS_SESSION_BUS_ADDRESS into the fetcher environment. To avoid the user needing to set it in their local.conf (which wouldn't be usable) or adding it to the environment-cleansing whitelist (which would potentially impact builds) allow the variables being passed to the fetchers to come from the data store (first) or the original environment (second). (Bitbake rev: 20ad1ea87712d042bd5d89ce1957793f7ff71da0) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29utils.bbclass: note for deprecated base_containsRobert Yang
(From OE-Core rev: 1a0e56630c5c27d8899dd0979ae0b86bbe227881) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29oeqa/sstatetests: remove temporary DL_DIRs in noop_samesigsRoss Burton
(From OE-Core rev: a98acf4840fc4888c0f4b8998a0a3983c639ecc2) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29attr: Remove redundant "+=" after "_append"Robert P. J. Day
(From OE-Core rev: 9566c3bb7c95d42973e63f672522e13bebf3ccd7) Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29oeqa/sstatetests: add http_proxy to no-op hash testRoss Burton
Add two values for http_proxy to verify that changing it doesn't change any unexpected tasks. As this causes uninative to fail to fetch, ensure that uninative is always disabled. (From OE-Core rev: 7d8ffd22303a5b89cb129e804c124a2d1dedf9ab) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29bluez5: enable out-of-tree buildsRoss Burton
A patch is needed to fix a race in out-of-tree builds, and the install-ptest logic can be simplified. (From OE-Core rev: 471fdafb340e90a4ab2e31854f69d5204e9380bf) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29mx: move to autotools instead of autotools-brokensepRoss Burton
Now that MX inherits gtk-doc we can also remove fix-build-dir.patch. (From OE-Core rev: e8d4e80e5cc98e2e0470c85f3c08574d30d466c1) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29mx-1.0: inherit gtk-docRoss Burton
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29meta: add comments to explain autotools-brokensep useRoss Burton
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29cups.inc: Fix ldflags warning.Noor Ahsan
* While building following warning comes up QA Issue: No GNU_HASH in the elf binary: '...libcups.so.2' [ldflags] Fix this warning by settin DSOFLAGS. (From OE-Core rev: 5dfbdf6d370125841d10120f39e8b771d1ed8aef) Signed-off-by: Noor Ahsan <noor_ahsan@mentor.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29wic: add help for --system-id optionEd Bartosh
Added explanation of --system-id option to the output of wic help kickstart. [YOCTO #9096] (From OE-Core rev: 1a304afea4ad7be12ed5f0fcb397a538345a6b63) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29wic: set partition system idEd Bartosh
Used sfdisk to set partition system id if --system-id parameter is used for a partition in wks file. [YOCTO #9096] (From OE-Core rev: a1f7f7e61fd20fb6319825648930f7b6aa0e0cee) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29wic: add system_id argument to Image.add_partitionEd Bartosh
Added new argument to add_partition call to pass partition system id down the stack. [YOCTO #9096] (From OE-Core rev: f2733df697192c0010c17b7bbb02f8679cb8f313) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29wic: add system_id attribute to PartitionEd Bartosh
Added Partition.system_id attribute and initialized it from parse result of wks option --system-id. It will be used by the wic code below the call stack to set partition system id. [YOCTO #9096] (From OE-Core rev: 4f195a5b7574ebff8fbdb3045daa71f173f97a30) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29wic: add sfdisk to the list of utilitiesEd Bartosh
Added sfdisk -> util-linux pair to the dictionary executable -> recipe as sfdisk is going to be used by wic to set partition system id. [YOCTO #9096] (From OE-Core rev: 398aafa185acbc7239505f7107735e93a502f6d2) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-29wic: add --system-id wks optionEd Bartosh
Added new option --system-id to wks parser. The option will be used to set partition system id. [YOCTO #9096] (From OE-Core rev: b9c56b1c95cd1d0fd809d257e0cd05a50c481bed) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-06-11 22:17:59 +0000