Without this patch, we may have problem using vim.
Steps to reproduce the problem is as follows:
1. Set NO_RECOMMENDATIONS to "1".
2. bitbake core-image-minimal
3. runqemu qemux86
4. On target, execute `vi 1.txt'.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Some perl example scripts cause RPM to add perl as a
dep, which we don't want, so remove x bit as work around
just like the ones for csh and awk.
Refer to:
1b088e4 vim: workaround nawk dependency problem with RPM
280d150 vim: workaround a dependency problem with RPM
I think a better solution might be:
Split the tools directory into a new package ${PN}-tools
and add RDEPENDS on csh, awk and perl for it and we don't
put it in RRECOMMENDS to install along with vim.
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
The majority of the vim runtime files have been moved from the package
'vim-data' to the package 'vim-common'. However, 'vim-data' was still in
RRECOMMENDS and 'vim-common' was not, so the runtime files were not being
installed by default.
To fix this, 'vim-data' is removed from RRECOMMENDS and 'vim-common' is added
instead. 'vim-data' is also removed from PACKAGES as it should now be empty.
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Out-of-tree builds don't seem to work for vim, probably as it doesn't use
automake.
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Previously, it still was checked when there was no elf library in sysroots directory.
Add knob to decide whether elf.h are checked or not.
Fixed by using PACKAGECONFIG to check elf, with default disabled set.
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Vim/vim-tiny always check 'sys/acl.h' existence even acl support
has been disabled from configure line. This works in mostly time
but except for acl works in an odd mode - while acl was mirrored
from sstate_cache, it will install 'sys/acl.h' to sysroot dir and
and then clean the header file with sysroot_cleansstate().
If build vim/vim-tiny and acl in parallel, below errors will occur:
* os_unix.c:2668:23: fatal error: sys/acl.h: No such file or directory
This change only workaround the failure and get build running, we
still need to fix it from acl side.
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
1. Add explicit selinux and acl support control.
2. Vim depends on gettext-native, add to the dependency list.
3. Split binary file into vim package and put others in vim-common.
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
The patch against configure.in was resubmitted to the vim mailing list and was
merged into the upstream sources so is no longer needed.
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
We end up with install errors when using high parallel factor like -j20
errors like
| mkdir: cannot create directory
`/``build/tmp-eglibc/work/ppce500v2-poky-linux-gnuspe/vim/7.4.27-r0/image/usr/share/vim/vim74':
File exists
| mkdir: cannot create directory
`/build/tmp-eglibc/work/ppce500v2-poky-linux-gnuspe/vim/7.4.27-r0/image/usr/share/vim/vim74':
File exists
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
'vim.inc' is merged into the new recipe 'vim_7.4.27.bb', the recipe is slightly
reorganised and a minor omission in the comments is corrected.
DESCRIPTION is replaced with SUMMARY. PR and INC_PR values are dropped. The
variable PV_MAJOR is also dropped as it isn't used.
LIC_FILES_CHECKSUM is updated as an address and version number given in the
license have been modified. The main license text itself is unchanged.
The setting of PARALLEL_MAKE to force single-threaded compilation is removed as
there is no justification in the git history for this being needed and the
compilation completes fine without it.
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
One of the examples has a #!/usr/bin/nawk which tells RPM to add that as a
dep, which we don't want.
Signed-off-by: Peter A. Bigot <pab@pabigot.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This is the last patch in the vim 7.3 series, the next release will be vim 7.4.
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Replace version 7.2.446 with the latest version currently available, 7.3.905.
The old fetch method was inefficient as version 7.2 was downloaded and patches
applied to get to version 7.2.446. Attempting this method with git 7.3 did not
work as not all 905 patches applied cleanly. Instead we fetch version 7.3.905
directly from the upstream mercurial repository. This causes an implicit
dependency on mercurial-native for the build which is reasonable considering
that not many images include vim by default.
The previously used patch configure.in_remove_CC_quotes.patch is still required
as these changes haven't been made upstream; this patch still applies cleanly.
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
The vim license conditions are in the file runtime/doc/uganda.txt within the
sources, not src/README.txt.
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Rather than keeping our own local vimrc file we can use vimrc_example.vim from
the runtime files distributed with vim. This keeps us up-to-date with changes to
the config when we move to a new vim version.
Also tidy comments around do_install_append so that it is clearer what is
happening.
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
By default, vim binaries are stripped during the build. This prevents us from
putting non-stripped binaries into a -dbg package. Passing 'STRIP=/bin/true' to
configure is the method recommended in the vim Makefile to disable stripping of
binaries during the build.
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* This change is only aesthetic (unlike indentation in Python
tasks).
* Some recipes were using tabs.
* Some were using 8 spaces.
* Some were using mix or different number of spaces.
* Make them consistently use 4 spaces everywhere.
* Yocto styleguide advises to use tabs (but the only reason to keep
tabs is the need to update a lot of recipes). Lately this advice
was also merged into the styleguide on the OE wiki.
* Using 4 spaces in both types of tasks is better because it's less
error prone when someone is not sure if e.g.
do_generate_toolchain_file() is Python or shell task and also allows
to highlight every tab used in .bb, .inc, .bbappend, .bbclass as
potentially bad (shouldn't be used for indenting of multiline
variable assignments and cannot be used for Python tasks).
* Don't indent closing quote on multiline variables
we're quite inconsistent wheater it's first character on line
under opening quote or under first non-whitespace character in
previous line.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Acked-by: Koen Kooi <koen@dominion.thruhere.net>
* only one of those should be built in sysroot, otherwise they were
overwritting files provided by other alternatives
* define PACKAGECONFIG options
* there are no RCONFLICTS/RREPLACES/RPROVIDES, because it depends on
selected PACKAGECONFIGs
* add PN to VIMDIR and use VIMDIR where undefined VIMVER was
(e.g. "${PN}${VIMVER}")
* move checksums from .inc to recipe
* vim/gvim/vim-tiny conflict is now fatal, with
http://patches.openembedded.org/patch/43105/
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Used sed expression given here:
http://lists.linuxtogo.org/pipermail/openembedded-core/2011-November/012373.html
Plus an additional expression for .expand. Full expression is:
sed \
-e 's:bb.data.\(setVar([^,]*,[^,]*\), \([^ )]*\) *):\2.\1):g' \
-e 's:bb.data.\(setVarFlag([^,]*,[^,]*,[^,]*\), \([^) ]*\) *):\2.\1):g' \
-e 's:bb.data.\(getVar([^,]*\), \([^, ]*\) *,\([^)]*\)):\2.\1,\3):g' \
-e 's:bb.data.\(getVarFlag([^,]*,[^,]*\), \([^, ]*\) *,\([^)]*\)):\2.\1,\3):g' \
-e 's:bb.data.\(getVarFlag([^,]*,[^,]*\), \([^) ]*\) *):\2.\1):g' \
-e 's:bb.data.\(getVar([^,]*\), \([^) ]*\) *):\2.\1):g' \
-e 's:bb.data.\(expand([^,]*\), \([^ )]*\) *):\2.\1):g' \
-i `grep -ril bb.data *`
Some minor correction in systemd.bbclass was needed for some expressions
that didn't quite match the regex in the desired way; additionally a few
instances were manually changed.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Changes from org.oe.dev:
* Include latest (stable) patchset
* Change from RCONFLICTS to RREPLACES where possible (gvim->vim->tiny-vim)
Signed-off-by: Michael Lippautz <michael.lippautz@gmail.com>
Paul Barker
Chen Qi
Jackie Huang
Chong Lu
Khem Raj
Peter Bigot
Martin Jansa
Paul Eggleton
Koen Kooi
Michael Lippautz