summaryrefslogtreecommitdiffstats
path: root/scripts/lib/ptxd_make_world_patchin.sh
Commit message (Collapse)AuthorAgeFilesLines
* ptxd_make_world_patchin: allow specifying a custom patch directoryMichael Olbrich2019-10-031-2/+1
| | | | | | | | If <PKG>_PATCHES is set, then it is used instead of $(<PKG>) to find the patch directory. It must be a relativ directory name that can be found in the usual search path. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
* CREDITS: remove unmaintained fileRoland Hieber2019-07-031-2/+0
| | | | | | | | | | | | | | | This file has been touched 2 times in the last 7 years, and is no longer up to date. Remove it to carry less unmaintained stuff around. Also remove all references to it from file headers using for file in `g grep -l 'See CREDITS for details about who has'`; do sed -i '/See CREDITS for details about who has/,+1d' $file done as well as the different wording from rules/other/Toplevel.make. Signed-off-by: Roland Hieber <rhi@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
* ptxd_make_world_patchin: drop support for old generic/ subdirMichael Olbrich2019-05-311-4/+8
| | | | | | | | For legacy reasons, patches could be in a 'generic' subdir. This has not been used in a long time. Remove support for this but add a check to fail, if such patches are found. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
* ptxd_make_world_patchin_fixup: skip for non-autoconf packagesMichael Olbrich2019-05-271-0/+6
| | | | | | | | | It's not needed here. It wastes unnecessary build time and makes working with '--git' harder because extra files may be are modifies. This is relevant for packages that support multiple build systems and autoconf is not used. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
* ptxd_make_world_patchin_post: call autogen.sh in the correct directoryMichael Olbrich2019-04-251-1/+1
| | | | | | | | | autogen.sh will operate on configure.ac in the current directory. If <PKG>_SUBDIR is set then autogen.sh must be called in this subdirectory. ${pkg_conf_dir_abs} will be used to call configure later anyways, so we can use it here as well. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
* ptxd_make_world_patchin_fixup: some whitespace fixesMichael Olbrich2019-04-251-3/+3
| | | | Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
* patchin: Don't trigger git garbage collectionUwe Kleine-König2019-04-081-13/+24
| | | | | | | | | | | | | | | | When extracting the sources for a big package (e.g. kernel) git forks a process to repack the repository "for optimum performance" (unless configured otherwise for example in ~/.gitconfig). However this is time that is not well spend when waiting for a build to complete. So ensure that ptxdist doesn't trigger this housekeeping. As this cleanup is sensible as soon as you start modifying the git repository, suppress it only via the commandline instead of modifying the repository's configuration. Reported-by: Tim Knecht <T.Knecht@eckelmann.de> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
* patchin: set core.autocrlf=false for '--git'Michael Olbrich2019-03-131-0/+1
| | | | | | | Using git here should have as little impact as possible, so line-endings should not be changed. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
* ptxd_make_world_{extract,patchin}: handle lndir:// like file://Michael Olbrich2018-10-091-1/+1
| | | | | | | PTXDIST_PATH_LAYERS is used to find the absolute path for Relative file:// URLs. Do the same thing for lndir://. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
* patchin: run autogen.sh for local-src/ packagesMichael Olbrich2017-11-231-9/+9
| | | | | | | | This is useful when working with local-src/ symlinks. autogen.sh needs to run there as well and this way it will be executed in the correct environment. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
* scripts: consolidate file URL usageMichael Olbrich2017-11-231-5/+1
| | | | Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
* ptxd_make_world_patchin_init: skip patch-in on local source directoriesJuergen Borleis2017-11-171-12/+13
| | | | | | | | Local sources (e.g. BSP relative paths) are intended for development and should never be patched. The current implementation does it by accident. This change sorts out local paths explicitly. Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
* ptxd_make_world_compile.sh: conditionally redirect stderr>stdoutJon Ringle2017-06-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I discovered after updating to a new version of ptxdist that all of my compile output including errors/warnings are now all going to stdout instead of having the errors/warning going to stderr. This is causing some problem when I use qtcreator as my IDE because qtcreator will only filter stderr for errors/warnings to put into the Issues tab, where one can simply click on the error/warning and be taken right to the source line where the error/warning is found. I found that this problem was introduced by commit 30b9267e35eea1c2edb4da0231a428bfa25b6766 This patch will conditionally redirect stderr>stdout on compile output if ptxdist has output synchronization enabled. This small program demonstrates the behavior with this patch applied: $ cat local_src/testprog/testprog.c int main(int argc, char *argv[]) { printf("Hello World, I'm testprog!\n"); exit(EXIT_SUCCESS); } $ ptxdist compile testprog >/dev/null testprog.c:4:2: error: #error An error here #error An error here ^ make[1]: *** [testprog] Error 1 make: *** [/home/jringle-admin/code/gpec/ec1k-rootfs/platform-EC1K/state/testprog.compile] Error 2 $ ptxdist compile --output-sync testprog >/dev/null make: *** [/home/jringle-admin/code/gpec/ec1k-rootfs/platform-EC1K/state/testprog.compile] Error 2 $ ptxdist compile --no-output-sync testprog >/dev/null testprog.c:4:2: error: #error An error here #error An error here ^ make[1]: *** [testprog] Error 1 make: *** [/home/jringle-admin/code/gpec/ec1k-rootfs/platform-EC1K/state/testprog.compile] Error 2 Signed-off-by: Jon Ringle <jringle@gridpoint.com> [mol: bailout to PTXDIST_FD_STDERR and more cleanup] Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
* ptxd_make_world_patchin_fixup: fixup option checkingMichael Olbrich2017-01-271-0/+1
| | | | | | | make sure the configure scripts don't overwrite the enable_option_checking=fatal that we set in the environment. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
* redirect command stderr to stdoutMichael Olbrich2016-05-291-1/+1
| | | | | | | | | | | | | Redirect stderr to stdout for the actual autogen.sh, prepare, compile, install and opkg-build command. This preserves the chronological order of stdout vs. stderr when building packages in parallel with output sync enabled. As a side-effect, the stderr output of these commands won't show up on the console for quiet builds. But most of that is not really useful by itself anyways. And the resulting logfile is more readable now for the rest. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
* ptxd_make_world_patchin_apply_git: make sure the series file existsMichael Olbrich2016-05-191-1/+2
| | | | | | | | | | | | The series file for 'git quiltimport' was only created if the original series file is not empty. In this case, with newer git versions (at least 2.8.1) 'git quiltimport' returns an error if the series file is missing. An empty series file is usefull to start creating new patches. Create the series file for 'git quiltimport' to make sure this works with new git versions. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
* ptxd_make_world_patchin: don't complain about missing 'series' if there are ↵Michael Olbrich2015-11-071-21/+16
| | | | | | no patches Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
* ptxd_make_world_autogen: fail if autogen.sh is brokenMichael Olbrich2015-11-071-0/+3
| | | | Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
* ptxd_make_world_patchin_apply_git: fail on errorMichael Olbrich2015-07-271-5/+5
| | | | Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
* ptxd_make_world_patchin: don't fail on packages that don't extract anythingMarc Kleine-Budde2015-06-261-1/+1
| | | | | | | | | | | Since commit b6f9a55b3ddc ptxd_make_world_patchin: run use pkg_dir for patchin_fixup ptxdist will fail on packages that define a <PACKAGE>_DIR but don't create that during extract stage. This patch fixes the problem. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
* ptxd_make_world_patchin: remove leading 0 from patch numberMarc Kleine-Budde2015-06-111-1/+1
| | | | | | | ...otherweise bash would interprete the number as octal. This fails if the patch number contains a figure >= 8. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
* git-ptx-patches: play nice with patches managed by other toolsMichael Olbrich2015-06-031-0/+11
| | | | Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
* ptxd_make_world_patchin: run use pkg_dir for patchin_fixupMichael Olbrich2015-05-261-5/+7
| | | | | | | | This way, it is also called when the tarball is replaced with a symlink in local_src/. Also allow symlinks for ltmain.sh and config.sub. They will be replaced with modified copies of the original link target. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
* ptxd_make_world_patchin_fixup: replace config.sub with new versionMichael Olbrich2015-02-131-0/+7
| | | | | | | This is needed for newer architectures like aarch64 because older versions of config.sub don't support those yet. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
* patchin: set core.abbrev=12 when creating patches with gitMichael Olbrich2014-08-211-0/+1
| | | | Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
* Add support for xz'd patchesBernhard Walle2013-05-031-1/+4
| | | | | | | | Since kernel.org provides their patches as .xz-compressed files, that's quite useful. Signed-off-by: Bernhard Walle <bernhard@bwalle.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
* ptxd_make_world_patchin.sh: overwrite global diff.renames git optionAndreas Bießmann2013-02-031-0/+1
| | | | | | | | | | | | | | | When working with pure git work flow the git parameter diff.renames may save space when sending patches or storing them. However using a patch generated with this parameter in a mixed git/quilt/patch work flow is useless cause quilt/patch can not work with this information, they need explicit delete of lines and add of lines. This patch change the local git configuration of an extracted package to force the diff.renames parameter to false witch will overwrite a possible global configuration. Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
* prepare: move autogen into a separate stageMichael Olbrich2012-05-271-42/+69
| | | | Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
* git tag sanitizingptxdist-2012.02.0Jon Ringle2012-02-131-1/+1
| | | | | | | Replace ~ with - when creating a git tag Signed-off-by: Jon Ringle <jon@ringle.org> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
* ptxd_make_world_patchin: sort patches when creating missing series fileMichael Olbrich2011-11-011-1/+1
| | | | Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
* git-ptx-patches: Allow patches before base tagJon Ringle2011-07-151-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch series I have for the Linux kernel includes incremental patches from upstream like patch-2.6.33.1.bz2 patch-2.6.33.1-2.bz2 followed by a patch series for my board. But ptxdist messes this up when applying the patch series with git. This patch allows one to mark the base tag in the series with: #tag:base --start-number 1 Other arbitrary tags can also be put in the series: #tag:for-upstream --start-number 5 When using 'git ptx-patches' to regenerate the series, only the patches between "#tag:base" and the next "#tag:*" or EOF in the series are regenerated. All others in the series are left untouched. To use a different tag than the default tag base, use -t tagname. e.g.: # generated by git-ptx-patches patch-2.6.33.1.bz2 patch-2.6.33.1-2.bz2 patch-2.6.33.2-3.bz2 #tag:for-upstream --start-number 1 0001-for-upstream-1.patch 0002-for-upstream-2.patch 0003-for-upstream-3.patch #tag:base --start-number 4 0004-foo.patch 0005-bar.batch # 25a3096f40bc8d841c8bf3ec24dd101f - git-ptx-patches magic Any options included on a #tag:* line are passed to git format-patch when generating the patches for that section. Signed-off-by: Jon Ringle <jon@ringle.org> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
* [ptxd_make_world_patchin] use ptxd_in_path to find patch dirMichael Olbrich2011-01-241-5/+3
| | | | Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
* [extract] do nothing in extract and patching if both <PKG>_URL and ↵Michael Olbrich2010-10-271-0/+5
| | | | | | | | | <PKG>_SOURCE are undefined. This makes it possible to use the default extract stage for packages that have nothing to extract. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
* [ptxd_make_world_patchin] alias: call git-ptx-patches directlyMarc Kleine-Budde2010-08-021-1/+1
| | | | | | | Don't use "sh" because the script uses bashisms, this breaks on ubuntu where /bin/sh is dash. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
* Merge branch 'next/image_cleanups' of git://git.pengutronix.de/git/mkl/ptxdistMarc Kleine-Budde2010-07-161-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: scripts/lib/ptxd_make_install.sh This is due to "360f73777af1661d85ae0aa2434b6acde22da9fa" Fix dependencies to files in projectroot. The modifications to ptxd_make_install_init have been moved to ptxd_make_xpkg_prepare. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| * [libptxdist] rename "ptxd_get_dirs" -> "ptxd_get_path"Marc Kleine-Budde2010-07-151-1/+1
| | | | | | | | | | | | ...because this function works for directories and/or files. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
* | [patchin] define git alias 'ptx-patches' to update the ptxist patch seriesMichael Olbrich2010-07-081-0/+1
|/ | | | Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
* [patching] don't specify the directory when calling git initMichael Olbrich2010-06-041-3/+3
| | | | | | | | | | | * it's unnecessary because that's the current directory * older git versions can't handle it Based on a patch from Remy Bohmer <linux@bohmer.net> Also: fix the error propagation. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
* [patchin] add pedantic warning for missing series fileMichael Olbrich2010-04-211-0/+2
| | | | Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
* [txd_make_world_patchin] inform user about creation of git repoMarc Kleine-Budde2010-04-061-0/+2
| | | | | | ...because it might take some time. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
* [ptxd_make_world_patchin] git: set "para" to sane valueMarc Kleine-Budde2010-04-061-0/+5
| | | | | | ...to avoid using "para" from last cycle. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
* [ptxd_make_world_patchin] rework generation of git "patches" compat dirMarc Kleine-Budde2010-04-051-12/+11
| | | | | | | | | | | | | | | For various reasons (git quiltimport cannot handle compressed patches and uses a hardcoded "series" file) ptxdist creates a special "patches" folder that git quiltimport" works with. This patch changes the name of the folder from ".ptxdist/patches" to ".ptxdist/git-patches" so that the original patch folder can always be found in ".ptxdist/patches" and "patches" (which links to it) regardless of using git or not. This fixes a problem with the package "directfb-examples". Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
* [ptxd_make_world_patchin] work around git quiltimport's limitationsMarc Kleine-Budde2010-04-031-13/+22
| | | | | | decompress bzip2 and gz patches on the fly. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
* [ptxd_make_world_patchin] add option to apply patches with gitMarc Kleine-Budde2010-04-011-1/+71
| | | | Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
* [ptxd_make_world_patchin] provide shell based patchin implementationMarc Kleine-Budde2010-04-011-0/+331
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-19 15:03:36 +0000