summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* systemtap: Fix build in x32 ABIAníbal Limón2015-03-202-0/+35
| | | | | | | | | | | | Add a patch for fix printing of time_t value that is long long int in x32 ABI instead of long int. [YOCTO #7423] (From OE-Core rev: 194f0be44fa37605d0b5897138848fa378593d62) Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* mdadm: Fix build in x32 ABIAníbal Limón2015-03-202-0/+27
| | | | | | | | | | | | Add a patch for fix build in x32 ABI, the fail is cause by time_t printf because time_t is long int in x64 and long long int in x32. [YOCTO #7422] (From OE-Core rev: 753994a2016758ec058822d727b05ef9532b97c8) Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* systemd: set the location of binaries used by service filesJonathan Liu2015-03-201-1/+5
| | | | | | | | | | | | | Otherwise systemd uses AC_PROG_PATH and finds it in the sysroot or host system, which won't work on the target. [YOCTO #7408] (From OE-Core rev: 294adc0907a359d9c0ad260823188145aab294ad) Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* base.bbclass: clean up warning message for 'S'Jonathan Liu2015-03-201-1/+1
| | | | | | | | (From OE-Core rev: ddac4f3c1350c3a4e0ea4ae732de0689325d883f) Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* valgrind: enable building on 4.x kernelMartin Jansa2015-03-202-0/+38
| | | | | | | | (From OE-Core rev: e75d1d76949f944367d06bea82f519fdecda3ca3) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* udev: remove 'modprobe' local ruleJavier Viguera2015-03-201-3/+0
| | | | | | | | | | | | | | | | Since udev version 176 (udev commit 06316d9) udev switched modprobe explicit rules by the builtin kmod support. The rule using the builtin kmod support is in '/lib/udev/rules.d/80-drivers.rules': DRIVER!="?*", ENV{MODALIAS}=="?*", IMPORT{builtin}="kmod load $env{MODALIAS}" (From OE-Core rev: a6f256b0d6cf4e76228627eaa00c1dbe02e2e622) Signed-off-by: Javier Viguera <javier.viguera@digi.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* perf: add bash to RDEPENDSBruce Ashfield2015-03-201-1/+1
| | | | | | | | | | | | | | | | | perf has a dependency on bash in its utilities, which generate the following warning: WARNING: QA Issue: perf requires /bin/bash, but no providers in its RDEPENDS [file-rdeps] Since perf is not installed on extremely small systems, we just add bash to the RDEPENDS, rather than modifying scripts or removing content. [YOCTO: #7445] (From OE-Core rev: 6f39aae20d88a2d764c3a85617cd36b81af804f1) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* linux-yocto/3.19: integrate korg -stable updateBruce Ashfield2015-03-202-13/+13
| | | | | | | | | Updating to the latest and greatest -stable release for the 3.19 series. (From OE-Core rev: 1e60b5216a89a34eba7749244eeb53d5d12864eb) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* kernel-yocto: split meta data generation from patching phaseBruce Ashfield2015-03-201-2/+7
| | | | | | | | | | | | | | | | | | | | The linux-yocto kernel has a meta-data component which accompanies the actual tree. That meta-data is processed to generate a series file that controls the patching and configuration of the kernel. patching and configuration are two distinct phases, so when working on kernel configuration, it doesn't make sense to always have to re-run the patching step just to update configuration data in the meta-series. To allow a more granular set of tasks, we break the meta-data generation into a separate task, which runs before do_patch. This allows the task to be explicitly called when working on configuration, but otherwise has no impact on the build. (From OE-Core rev: 1be4c68fb876b63f19d107275b701fe1c1c121db) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* kern-tools: fix iterative configuration runsBruce Ashfield2015-03-201-1/+1
| | | | | | | | | | | | | | | | When fixing a kernel configuration warning, it is often necessary to modify the kernel's meta-data and re-run the tools to update and re-audit the config. This implies that the patch, config and audit steps are run multiple times. The tools had a bug that would incorrectly restore old meta-data versus using updated configuration. Updating the kern-tools SRCREV to fix the issue. (From OE-Core rev: b903559daa847d2c56bf729fc5ca885113d0eecc) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* gstreamer1.0: Shorten __FILE__ in gst_debug_log output on all platforms.Peter Urbanec2015-03-202-0/+56
| | | | | | | | | | | | On WIN32 the file argument to gst_debug_log_valist is shortened to just the filename. This is useful not only for MSVC, but also with gcc/Linux when doing cross-compilation builds and out-of-tree builds. (From OE-Core rev: d419be56df59c91294923ba4e136d8753009c280) Signed-off-by: Peter Urbanec <openembedded-devel@urbanec.net> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* dbus-test: make do_install run to trigger the effect of cleandirs flagChen Qi2015-03-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For now, we would meet the following QA error if we build dbus-test in the same build directory with multilib enabled/disabled. The steps are as follows: 1. Enable multilib and `bitbake dbus-ptest' 2. Disable multilib and `bitbake dbus-ptest' The error message is as follows: ERROR: QA Issue: dbus-test: Files/directories were installed but not shipped /usr/lib64 /usr/lib64/dbus-test /usr/lib64/dbus-test/ptest /usr/lib64/dbus-test/ptest/run-ptest ... The problem is that the ${D} is not cleaned up at the second build while it should be. This patch fixes the above problem. (From OE-Core rev: e76f8c0d79301b3c67029f18e5dd4325a39d4587) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* tcmode-default: Define one gdb versionKhem Raj2015-03-201-0/+5
| | | | | | | | | | | | | Sometimes we need to override the gdb from third party tool SDKs, this helps out, moreover it also makes it consistent with in OE-Core too to have multiple versions of gdb if we ever needed to Change-Id: Ibe1ae59175984bbc661c243764c81cd99fef54d1 (From OE-Core rev: aa75579aae064f2f9fc70bea093a6e9c8ca9c528) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* pulseaudio: add system.pa to CONFFILESTanu Kaskinen2015-03-201-0/+1
| | | | | | | | (From OE-Core rev: ca457db45b04070b1b1209e8cbd73f6fffa3f774) Signed-off-by: Tanu Kaskinen <tanu.kaskinen@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* pulseaudio: move client.conf to libpulseTanu Kaskinen2015-03-201-2/+7
| | | | | | | | | | | | | This fixes a scenario where the system has libpulse installed but not pulseaudio-server. The "breakage" didn't have any big practical effects, though, because the default client.conf contains only comments anyway. (From OE-Core rev: 58bcd2cfb71bd734c463d82e94bba77226691b43) Signed-off-by: Tanu Kaskinen <tanu.kaskinen@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package_manager: Create variable for install_dir_nameSaul Wold2015-03-202-8/+12
| | | | | | | | | | | | | | | | This patch creates a variable for the install_dir name so it can be something other than /install, also by doing this we can correctly clean up the empty directories (/install/tmp) during the clean-up phase. The new default is /oe_install so as to not conflict with other possible packages that might use /install to place files. [YOCTO #7353] (From OE-Core rev: 335effec42099666d0fb433b31981edcb0dae9a0) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* lib/oeqa/selftest/lic-checksum: Add INHIBIT_DEFAULT_DEPSRandy Witt2015-03-201-1/+2
| | | | | | | | | | | The test_nonmatching_checksum doesn't need the default dependencies, and they would just take extra time to generate. (From OE-Core rev: d91ed126eead8b09a4ddfe5cc11db16dda71273f) Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* lib/oeqa/selftest/lic-checksum: Rename test_fooRandy Witt2015-03-201-2/+2
| | | | | | | | | | | | | test_foo is renamed to test_nonmatching_checksum. It was a mistake to submit it with the old name. There was also some extra whitespace removed. (From OE-Core rev: 95eed3038f48337d06a3eba0f6e355f3f78c6974) Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* trace-cmd: remove unnecessary 'protocol=git' from SRC_URIMaxin B. John2015-03-201-1/+1
| | | | | | | | (From OE-Core rev: b9a97b56400d156bc670d933323d0e28ffb17960) Signed-off-by: Maxin B. John <maxin.john@enea.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* mmc-utils: remove unnecessary 'protocol=git' from SRC_URIMaxin B. John2015-03-201-1/+1
| | | | | | | | (From OE-Core rev: c2afbb763b5c57dcad22e8637a953d21948ebd29) Signed-off-by: Maxin B. John <maxin.john@enea.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* systemd: remove unnecessary 'protocol=git' from SRC_URIMaxin B. John2015-03-201-1/+1
| | | | | | | | (From OE-Core rev: cd163193de5b8c41583076a28ca45ae4f9bced2c) Signed-off-by: Maxin B. John <maxin.john@enea.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot-mkimage: remove unnecessary 'protocol=git' from SRC_URIMaxin B. John2015-03-201-1/+1
| | | | | | | | (From OE-Core rev: c1e5fff3017860feb5fb77ba05afd13e1ec34c50) Signed-off-by: Maxin B. John <maxin.john@enea.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot-fw-utils: remove unnecessary 'protocol=git' from SRC_URIMaxin B. John2015-03-201-1/+1
| | | | | | | | (From OE-Core rev: 1a2b67c44b78582668d69e23f7f43835b34fe803) Signed-off-by: Maxin B. John <maxin.john@enea.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* oe-selftest: add missing dependency to test_recipetool_create_gitPaul Eggleton2015-03-201-2/+2
| | | | | | | | | | | libmatchbox links to libjpeg if it is present so just explicitly build it and then check it appears in DEPENDS. (From OE-Core rev: 00ca890d8a56c4c05ce5bda87b3d9d1452ddfa36) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* recipetool: fix duplicate licenses being picked upPaul Eggleton2015-03-201-1/+3
| | | | | | | | | | | If a license file matched more than one of the specifications (e.g. COPYING.GPL) then it was being added to LIC_FILES_CHKSUM more than once. (From OE-Core rev: 58316a2890782d206e9b9472ba483367f7560109) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* oe-selftest: add a test for devtool modify on recipes fetching local filesPaul Eggleton2015-03-201-0/+32
| | | | | | | | | | | With the change to externalsrc we can now handle these, so add a test to ensure they can be built. (From OE-Core rev: efd46543524db98e4369c1d85a1e1c0e76f12899) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* oe-selftest: add a test for devtool deploy-targetPaul Eggleton2015-03-202-0/+65
| | | | | | | | | | | | | | | | | | | Whilst this test would seemingly be better placed as a runtime test, unfortunately the runtime tests run under bitbake and you can't run devtool within bitbake (since devtool needs to run bitbake itself). Additionally we are testing build-time functionality as well, so really this has to be done as an oe-selftest test. This test does have a few perhaps unusual requirements in order to run: * pexpect is installed * MACHINE is set to one of the qemu machines * runqemu tap devices have been set up (From OE-Core rev: 9dc16a8a87bef5dc408aefb256c01e2a4fe3563c) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* oe-selftest: support getting unexported variable valuesPaul Eggleton2015-03-201-0/+7
| | | | | | | | | | | Allow get_bb_var() to work with unexported variable values such as MACHINE - the workaround is a little crude but should suffice for now. (From OE-Core rev: 48b58466bba084fd3439706d47e0cfbb7e951ee4) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* gitignore: exclude meta-selftest, drop meta-hobPaul Eggleton2015-03-201-1/+1
| | | | | | | | | | | | * We don't want to ignore changes in the meta-selftest directory * While I'm at it, meta-hob has been gone for a while now, so drop the reference to it here. (From OE-Core rev: 6bcc652f5168d87e76b059f9e9825b8bcf049b90) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* devtool: deploy-target: add dry-run optionPaul Eggleton2015-03-201-0/+16
| | | | | | | | | | | | Add a dry-run option to the deploy-target and undeploy-target subcommands so you can see the list of files to be deployed or un-deployed before actually carrying out the operation. (From OE-Core rev: b9625581f3fe72fc402632be2d87cf889301c6a2) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* classes/externalsrc: fix for recipes that fetch local filesPaul Eggleton2015-03-201-1/+13
| | | | | | | | | | | | If SRC_URI contains local files (file:// references) these will almost certainly be required at some point during the build process, so we need to actually fetch these to ${WORKDIR} as we would normally. (From OE-Core rev: f223ad3d5b5c90055e50d1b1be69230f55e06336) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* devtool: deploy-target: add an option to disable quiet modePaul Eggleton2015-03-201-3/+12
| | | | | | | | | | | | | | The -q option to scp does stop the progress being shown, which is mostly superfluous, however it also stops errors from ssh being shown - if there's a problem, you'll just get "lost connection" which really isn't that helpful. As a compromise, add a -s/--show-status option and advertise this when the command fails. (From OE-Core rev: 5cbb026212b4c8f5206a07d70b94f57edeee0839) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* devtool: deploy-target: detect and error if D is emptyPaul Eggleton2015-03-201-2/+6
| | | | | | | | | | | If you haven't built the recipe yet or if the output directory (${D}) is empty, then we should tell the user rather than have scp error out. (From OE-Core rev: 3fd9ac277393bef5c646f16b9d8f30c277881d70) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* devtool: deploy-target: allow disabling host key checkingPaul Eggleton2015-03-201-4/+13
| | | | | | | | | | | | | | | | | | | | | | If you're testing with multiple images/devices that have the same IP address / hostname then it can be annoying to deal with host key mismatches all of the time. As a MITM attack is unlikely in the local test environment, provide a command line option to pass the appropriate options to scp/ssh to disable the host key checking. Note: if you wish to apply this permanently, the best way is to do it through your ssh configuration e.g. by adding the following to your ~/.ssh/config: Host 192.168.7.2 UserKnownHostsFile=/dev/null StrictHostKeyChecking no (From OE-Core rev: 81dd1319112a99bc38b7a7ced0663918ac5b09a4) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* devtool: modify/extract: prevent usage with incompatible recipesPaul Eggleton2015-03-202-13/+59
| | | | | | | | | | | | Consolidate code for checking compatible recipes and consider meta and packagegroup recipes as well as package-index and gcc-source to be incompatible. (From OE-Core rev: 4be9bf637583b341a89af1b9924752abc7d49c94) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* devtool: modify: get correct initial revision from previously extracted ↵Paul Eggleton2015-03-201-2/+13
| | | | | | | | | | | | | | | source tree If you point devtool modify to a source tree previously created by devtool modify or devtool extract, then we need to try to pick up the correct initial revision so that devtool update-recipe knows where to start looking for commits that match up with patches in the recipe. (From OE-Core rev: c20e10543e268ebb43074a3f8d6e7ed991e54ec8) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* devtool: reset: add ability to reset entire workspacePaul Eggleton2015-03-202-19/+62
| | | | | | | | | | | Add a -a/--all option to allow you to quickly reset all recipes in your workspace. (From OE-Core rev: 0c83788b111a761f6f500b86780cc51aed255402) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* devtool: name command line parsers appropriatelyPaul Eggleton2015-03-201-22/+22
| | | | | | | | | | No functional changes, just use a unique name for each parser. (From OE-Core rev: 5fabc59d6221c3fe7137b70e31ec2761a4276a6c) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* devtool: deploy-target: fix deploying to previously deployed machinePaul Eggleton2015-03-201-1/+3
| | | | | | | | | | | * Pass correct arguments to undeploy() function * If an error occurs during undeploy(), exit instead of continuing (From OE-Core rev: c938dee4b28af7e6296c86347dfa533f85605033) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* combo-layer-hook-default.sh: handle patches without Signed-off-byPatrick Ohly2015-03-201-1/+8
| | | | | | | | | | | | | | | | Inserting the "From rev" comment depended on having at least one Signed-off-by line in the patch header. Some old repository commits in openembedded-core and bitbake do not have those. When inporting those, just insert at the end of the patch header. While doing so, ensure that there's exactly one blank line since the last non-blank line. (From OE-Core rev: 58548081b15f37452b71c135d5aa8cbbda5b1b61) Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* combo-layer-hook-default.sh: beware of embedded patchesPatrick Ohly2015-03-201-1/+1
| | | | | | | | | | | | | | | Patching the subject line must be limited to the subject of the main patch itself. In particular, git formatted patches embedded in the patch must not be changed. Achieved by limiting the replacement to the lines until the first subject in the patch, just as it is done for modifying the first Signed-off-by. (From OE-Core rev: 2737bd1c3f7c51dd6509a0f91337f695f9c69165) Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* combo-layer-hook-default.sh: avoid duplicating prefixPatrick Ohly2015-03-201-1/+1
| | | | | | | | | | | | The existing patch might already have the desired prefix, perhaps even multiple times (due to some previous import error). Ensure that after the replace, the prefix is present exactly once. (From OE-Core rev: 03be3d350425783a5938a7e4c0b858cda634b71d) Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* combo-layer: partial import for '--history init'Patrick Ohly2015-03-202-0/+53
| | | | | | | | | | | | | | | | | | | | The new "since_revision" property can be used to cut off the imported history at some point. This is useful to keep the resulting repository smaller while still preserving enough history that "git annotate" reports the right author and commit for most lines. The initial, squashed import commit shows up with "unknown" as author in the "git annotate" output. It has the repository name as prefix in the subject line; importing that commit works best with a layer hook which does not add the repository name again when it is already present. Adding it here is useful for hooks which do not extend the subject line. (From OE-Core rev: 74f4c9e3bcdb3c4ca919623086e92a9379bd81ff) Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* combo-layer: combine trees via replacement objectsPatrick Ohly2015-03-201-8/+8
| | | | | | | | | | | | | | | | | Instead of local graft entries rooting the imported branches in the shared root commit, use replacement objects. The advantage is that they get moved around by "git push" and "git fetch", so everyone has the same, nicer view with everything starting at the beginning of the combined repository. If undesired, these objects can be removed with "git replace". (From OE-Core rev: 220d816cda3c9b8d888288cc03eb74be5e71cc59) Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* combo-layer: init with full historyPatrick Ohly2015-03-201-13/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new --history parameter enables a new mode in "combo-layer init" where it copies the entire history of the components into the new combined repository. This also imports merge commits. Moving into a destination directory and applying commit hooks is done via "git filter-branch" of the upstream branch. File filtering uses the same code as before and just applies it to that filtered branch to create the final commit which then gets merged into the master branch of the new repository. When multiple components are involved, they all get merged into a single commit with an octopus merge. This depends on a common ancestor, which is grafted onto the filtered branches via .git/info/grafts. These grafts are currently left in place. However, they do not get pushed, so the local view on the entire history (all branches rooted in the initial, empty commit, temporarily diverging and then converging) is not the same as what others will see (branches starting independently and converging). Perhaps "git replace" should be used instead. The final commit needs to be done manually, as before. A commit message with some tracking information is ready for use as-is. This information should be sufficient to implement also "combo-layer update" using this approach, if desired. The advantage would be that merge commits with conflict resolution would not longer break the update. (From OE-Core rev: 9e40cb1ab77029df7f2cf1e548a645ff6a62c919) Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* combo-layer: update() also instance propertyPatrick Ohly2015-03-201-0/+1
| | | | | | | | | | | | The Configuration class mirrors all properties in local hashes. When updating the configuration, also update these properties to remain consistent. (From OE-Core rev: c575ff183ae5c35e0f7e8d90c222994574ce73c9) Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* combo-layer: exclude filesPatrick Ohly2015-03-202-1/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some combined repos intentionally do not include certain files. For example, Poky does not include bitbake's setup files and OE-core's sample files under meta/conf. When these files get modified in the upstream repository, applying the patches fails and requires manual intervention. That is merely a nuisance for someone familiar with the problem, but a real show stopper when having the import run automatically or by someone less experienced. Therefore this change introduces "file_exclude", a new per-repo list of file patterns which removes all matching files when initializing or updating a combined repository. Because fnmatch is used under the hood to match full path strings, removing entire directories must be done with a pattern ending in a '/*' (in contrast to file_filter). For Poky, the additional configuration looks like this: [bitbake] ... file_exclude = classes/base.bbclass conf/bitbake.conf .gitignore MANIFEST.in setup.py TODO [openembedded-core] ... file_exclude = meta/conf/bblayers.conf.sample meta/conf/local.conf.sample meta/conf/local.conf.sample.extended meta/conf/site.conf.sample (From OE-Core rev: a51b37f4db6b144386d1bd5789ec91acc78a0bd8) Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* combo-layer: runcmd() with separate outputPatrick Ohly2015-03-201-7/+11
| | | | | | | | | | | | | | | | | Allow the caller to specify a separate output stream. stderr is always a temporary file opened by runcmd(), so read from that to capture output for error reporting *and* the return value. The reasoning for the latter is a) that this preserves the traditional behavior when out=None and b) if the caller wants the content of stdout, it can read from the stream itself, which is not possible for the temporary stderr. (From OE-Core rev: a084162a9dc4718ab453723f1f28aefc55100e2e) Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* combo-layer: make Signed-off-by optionalPatrick Ohly2015-03-202-1/+16
| | | | | | | | | | | | | | | | | | | | | It depends on the diligence of the person running the combo-layer tool whether the Signed-off-by line added to each commit actually indicates that the person was involved in validating the change. When the import is purely automatic, it is better to not add the line, because the history is more useful without it (searching for the person really only lists changes he or she was involved with) and it would be a false statement. The 'signoff' property can be set per repository, like every other property. But setting it in the special [DEFAULT] section is more useful, so that is what the example shows. (From OE-Core rev: dba34e5a6f0a4c726266654dc5f26e0f7f13db0f) Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* combo-layer: let user choose where properties get updatedPatrick Ohly2015-03-201-1/+3
| | | | | | | | | | | | | | | | | | | | When updating a property (at the moment, only 'last_revision'), first check whether the user already added it to the main config. If so, update there even if there is a local config. This way, 'last_revision' can be shared between developers as part of the repository while still configuring per-developer repo paths outside of the git repository in a local config. An example of a repository which is set up like that is tizen-distro, with instructions for such a collaborative maintenance found here: https://review.tizen.org/git/?p=scm/bb/tizen-distro.git;a=blob;f=README;hb=refs/heads/tizen-ivi (From OE-Core rev: a3b246ee928d2ec59c8b6a775d9309f5be33ecc7) Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-07-06 23:12:43 +0000