Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
B
busybox
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Labels
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Jobs
Commits
Open sidebar
mer-core
busybox
Commits
dc1597a2
Commit
dc1597a2
authored
Aug 29, 2019
by
Tomi Leppänen
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'enable_selinux' into 'master'
Enable SELinux See merge request
!14
parents
23b01223
f80535d8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
6 deletions
+7
-6
rpm/busybox-sailfish.config
rpm/busybox-sailfish.config
+1
-1
rpm/busybox-static.config
rpm/busybox-static.config
+3
-3
rpm/busybox.spec
rpm/busybox.spec
+3
-2
No files found.
rpm/busybox-sailfish.config
View file @
dc1597a2
...
...
@@ -32,7 +32,7 @@ CONFIG_FEATURE_SUID_CONFIG=y
CONFIG_FEATURE_SUID_CONFIG_QUIET
=
y
# CONFIG_FEATURE_PREFER_APPLETS is not set
CONFIG_BUSYBOX_EXEC_PATH
=
"/proc/self/exe"
# CONFIG_SELINUX is not set
CONFIG_SELINUX
=
y
# CONFIG_FEATURE_CLEAN_UP is not set
# CONFIG_FEATURE_SYSLOG_INFO is not set
# CONFIG_FEATURE_SYSLOG is not set
...
...
rpm/busybox-static.config
View file @
dc1597a2
...
...
@@ -32,7 +32,7 @@ CONFIG_FEATURE_SUID_CONFIG=y
CONFIG_FEATURE_SUID_CONFIG_QUIET
=
y
# CONFIG_FEATURE_PREFER_APPLETS is not set
CONFIG_BUSYBOX_EXEC_PATH
=
"/proc/self/exe"
# CONFIG_SELINUX is not set
CONFIG_SELINUX
=
y
# CONFIG_FEATURE_CLEAN_UP is not set
CONFIG_FEATURE_SYSLOG_INFO
=
y
CONFIG_FEATURE_SYSLOG
=
y
...
...
@@ -185,7 +185,7 @@ CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
CONFIG_FEATURE_TAR_TO_COMMAND
=
y
CONFIG_FEATURE_TAR_UNAME_GNAME
=
y
CONFIG_FEATURE_TAR_NOPRESERVE_TIME
=
y
# CONFIG_FEATURE_TAR_SELINUX is not set
CONFIG_FEATURE_TAR_SELINUX
=
y
CONFIG_UNZIP
=
y
CONFIG_FEATURE_UNZIP_CDF
=
y
# CONFIG_FEATURE_UNZIP_BZIP2 is not set
...
...
@@ -462,7 +462,7 @@ CONFIG_FEATURE_FIND_PRUNE=y
CONFIG_FEATURE_FIND_DELETE
=
y
CONFIG_FEATURE_FIND_PATH
=
y
CONFIG_FEATURE_FIND_REGEX
=
y
# CONFIG_FEATURE_FIND_CONTEXT is not set
CONFIG_FEATURE_FIND_CONTEXT
=
y
CONFIG_FEATURE_FIND_LINKS
=
y
CONFIG_FEATURE_FIND_EXECUTABLE
=
y
CONFIG_FEATURE_FIND_QUIT
=
y
...
...
rpm/busybox.spec
View file @
dc1597a2
...
...
@@ -10,6 +10,9 @@ Source3: busybox-sailfish.config
Patch0: 0001-Copy-extended-attributes-if-p-flag-is-provided-to-cp.patch
Patch1: 0002-applets-Busybox-in-usr-bin-instead-of-bin.patch
URL: https://git.sailfishos.org/mer-core/busybox
BuildRequires: glibc-static
BuildRequires: libselinux-static libsepol-static
BuildRequires: pcre-static
Obsoletes: time <= 1.7
Provides: time > 1.7
...
...
@@ -18,8 +21,6 @@ Provides: time > 1.7
Obsoletes: iputils <= 20101006
Provides: iputils > 20101006
BuildRequires: glibc-static
%define debug_package %{nil}
%description
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment