Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'jb47318' into 'master'
[busybox] Enable vi. Contributes to JB#47318

See merge request mer-core/busybox!15
  • Loading branch information
MikeSalmela committed Dec 5, 2019
2 parents dc1597a + 9efb454 commit 2630062
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 25 deletions.
36 changes: 18 additions & 18 deletions rpm/busybox-sailfish.config
Expand Up @@ -402,24 +402,24 @@ CONFIG_FEATURE_DIFF_DIR=y
# CONFIG_ED is not set
# CONFIG_PATCH is not set
# CONFIG_SED is not set
# CONFIG_VI is not set
CONFIG_FEATURE_VI_MAX_LEN=0
# CONFIG_FEATURE_VI_8BIT is not set
# CONFIG_FEATURE_VI_COLON is not set
# CONFIG_FEATURE_VI_YANKMARK is not set
# CONFIG_FEATURE_VI_SEARCH is not set
# CONFIG_FEATURE_VI_REGEX_SEARCH is not set
# CONFIG_FEATURE_VI_USE_SIGNALS is not set
# CONFIG_FEATURE_VI_DOT_CMD is not set
# CONFIG_FEATURE_VI_READONLY is not set
# CONFIG_FEATURE_VI_SETOPTS is not set
# CONFIG_FEATURE_VI_SET is not set
# CONFIG_FEATURE_VI_WIN_RESIZE is not set
# CONFIG_FEATURE_VI_ASK_TERMINAL is not set
# CONFIG_FEATURE_VI_UNDO is not set
# CONFIG_FEATURE_VI_UNDO_QUEUE is not set
CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=0
# CONFIG_FEATURE_ALLOW_EXEC is not set
CONFIG_VI=y
CONFIG_FEATURE_VI_MAX_LEN=4096
CONFIG_FEATURE_VI_8BIT=y
CONFIG_FEATURE_VI_COLON=y
CONFIG_FEATURE_VI_YANKMARK=y
CONFIG_FEATURE_VI_SEARCH=y
CONFIG_FEATURE_VI_REGEX_SEARCH=y
CONFIG_FEATURE_VI_USE_SIGNALS=y
CONFIG_FEATURE_VI_DOT_CMD=y
CONFIG_FEATURE_VI_READONLY=y
CONFIG_FEATURE_VI_SETOPTS=y
CONFIG_FEATURE_VI_SET=y
CONFIG_FEATURE_VI_WIN_RESIZE=y
CONFIG_FEATURE_VI_ASK_TERMINAL=y
CONFIG_FEATURE_VI_UNDO=y
CONFIG_FEATURE_VI_UNDO_QUEUE=y
CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256
CONFIG_FEATURE_ALLOW_EXEC=y

#
# Finding Utilities
Expand Down
33 changes: 26 additions & 7 deletions rpm/busybox.spec
Expand Up @@ -61,8 +61,7 @@ is the symlinks implementing part of dosfstools.
%package symlinks-gzip
Requires: %{name} = %{version}-%{release}
Summary: Busybox replacements for gzip
Provides: gzip = %{version}
Obsoletes: gzip <= 1.5
Provides: gzip

%description symlinks-gzip
Busybox is a single binary which includes versions of a large number
Expand All @@ -85,7 +84,7 @@ the symlinks implementing the dhcp utilities (udhcpc/udhcpcd).
%package symlinks-diffutils
Requires: %{name} = %{version}-%{release}
Summary: Busybox replacements for diffutils
Provides: diffutils = %{version}
Provides: diffutils
Conflicts: gnu-diffutils

%description symlinks-diffutils
Expand All @@ -98,7 +97,7 @@ is the symlinks implementing part of diffutils replacements.
%package symlinks-findutils
Requires: %{name} = %{version}-%{release}
Summary: Busybox replacements for findutils
Provides: findutils = %{version}
Provides: findutils
Conflicts: gnu-findutils

%description symlinks-findutils
Expand All @@ -111,7 +110,7 @@ is the symlinks implementing findutils replacements.
%package symlinks-grep
Requires: %{name} = %{version}-%{release}
Summary: Busybox replacements for grep
Provides: grep = %{version}
Provides: grep
Provides: /bin/grep
Conflicts: gnu-grep

Expand All @@ -138,7 +137,7 @@ the symlinks implementing cpio replacements.
%package symlinks-tar
Requires: %{name} = %{version}-%{release}
Summary: Busybox replacements for tar
Provides: tar = %{version}
Provides: tar
Conflicts: gnu-tar

%description symlinks-tar
Expand All @@ -148,10 +147,23 @@ useful for recovering from certain types of system failures,
particularly those involving broken shared libraries. This
is the symlink implementing tar replacement.

%package symlinks-vi
Requires: %{name} = %{version}-%{release}
Summary: Busybox replacements for vi
Provides: vi
Conflicts: vim-minimal

%description symlinks-vi
Busybox is a single binary which includes versions of a large number
of system commands, including a shell. This package can be very
useful for recovering from certain types of system failures,
particularly those involving broken shared libraries. This
is the symlink implementing vi replacement.

%package symlinks-which
Requires: %{name} = %{version}-%{release}
Summary: Busybox replacements for which
Provides: which = %{version}
Provides: which
Conflicts: util-linux <= 2.33+git1

%description symlinks-which
Expand Down Expand Up @@ -201,6 +213,7 @@ cat >> busybox.links << EOF
%{_bindir}/fgrep
%{_bindir}/cpio
%{_bindir}/tar
%{_bindir}/vi
EOF

%install
Expand Down Expand Up @@ -293,6 +306,12 @@ install -m 644 -t %{buildroot}/%{_docdir}/%{name}-%{version} \
/bin/tar
%{_bindir}/tar

%files symlinks-vi
%defattr(-,root,root,-)
/bin/vi
%{_bindir}/vi

%files symlinks-which
%defattr(-,root,root,-)
%{_bindir}/which

0 comments on commit 2630062

Please sign in to comment.