Skip to content

Commit

Permalink
[busybox] Add sed symbolic link package. Contributes to JB#48742
Browse files Browse the repository at this point in the history
Signed-off-by: Matti Kosola <matti.kosola@jolla.com>
  • Loading branch information
Vtorygin.Valery authored and mkosola committed Sep 29, 2020
1 parent 42b5b05 commit c5c7ee9
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 1 deletion.
2 changes: 1 addition & 1 deletion rpm/busybox-sailfish.config
Expand Up @@ -414,7 +414,7 @@ CONFIG_FEATURE_DIFF_LONG_OPTIONS=y
CONFIG_FEATURE_DIFF_DIR=y
# CONFIG_ED is not set
# CONFIG_PATCH is not set
# CONFIG_SED is not set
CONFIG_SED=y
CONFIG_VI=y
CONFIG_FEATURE_VI_MAX_LEN=4096
CONFIG_FEATURE_VI_8BIT=y
Expand Down
17 changes: 17 additions & 0 deletions rpm/busybox.spec
Expand Up @@ -16,6 +16,7 @@ BuildRequires: glibc-static
BuildRequires: libselinux-static libsepol-static
BuildRequires: pcre-static
BuildRequires: systemd
BuildRequires: sed

Obsoletes: time <= 1.7
Provides: time > 1.7
Expand Down Expand Up @@ -146,6 +147,16 @@ Conflicts: procps-ng
%description symlinks-procps
%{summary} as symlinks.

%package symlinks-sed
Requires: %{name} = %{version}-%{release}
Summary: Busybox replacement for sed
Provides: sed = 1:4.1.5+git1
Obsoletes: sed < 1:4.1.5+git1
Conflicts: gnu-sed

%description symlinks-sed
%{summary} as symlinks.

%package symlinks-tar
Requires: %{name} = %{version}-%{release}
Summary: Busybox replacement for tar
Expand Down Expand Up @@ -265,6 +276,7 @@ cat >> busybox.links << EOF
%{_bindir}/pwd
%{_bindir}/rm
%{_bindir}/rmdir
%{_bindir}/sed
%{_bindir}/sleep
%{_bindir}/stat
%{_bindir}/stty
Expand Down Expand Up @@ -512,6 +524,11 @@ rm -f %{buildroot}/bin/pidof
%{_bindir}/uptime
%{_bindir}/w

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

%files symlinks-tar
%defattr(-,root,root,-)
/bin/tar
Expand Down

0 comments on commit c5c7ee9

Please sign in to comment.