Commit dc1597a2 authored by Tomi Leppänen's avatar Tomi Leppänen

Merge branch 'enable_selinux' into 'master'

Enable SELinux

See merge request !14
parents 23b01223 f80535d8
...@@ -32,7 +32,7 @@ CONFIG_FEATURE_SUID_CONFIG=y ...@@ -32,7 +32,7 @@ CONFIG_FEATURE_SUID_CONFIG=y
CONFIG_FEATURE_SUID_CONFIG_QUIET=y CONFIG_FEATURE_SUID_CONFIG_QUIET=y
# CONFIG_FEATURE_PREFER_APPLETS is not set # CONFIG_FEATURE_PREFER_APPLETS is not set
CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
# CONFIG_SELINUX is not set CONFIG_SELINUX=y
# CONFIG_FEATURE_CLEAN_UP is not set # CONFIG_FEATURE_CLEAN_UP is not set
# CONFIG_FEATURE_SYSLOG_INFO is not set # CONFIG_FEATURE_SYSLOG_INFO is not set
# CONFIG_FEATURE_SYSLOG is not set # CONFIG_FEATURE_SYSLOG is not set
......
...@@ -32,7 +32,7 @@ CONFIG_FEATURE_SUID_CONFIG=y ...@@ -32,7 +32,7 @@ CONFIG_FEATURE_SUID_CONFIG=y
CONFIG_FEATURE_SUID_CONFIG_QUIET=y CONFIG_FEATURE_SUID_CONFIG_QUIET=y
# CONFIG_FEATURE_PREFER_APPLETS is not set # CONFIG_FEATURE_PREFER_APPLETS is not set
CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
# CONFIG_SELINUX is not set CONFIG_SELINUX=y
# CONFIG_FEATURE_CLEAN_UP is not set # CONFIG_FEATURE_CLEAN_UP is not set
CONFIG_FEATURE_SYSLOG_INFO=y CONFIG_FEATURE_SYSLOG_INFO=y
CONFIG_FEATURE_SYSLOG=y CONFIG_FEATURE_SYSLOG=y
...@@ -185,7 +185,7 @@ CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y ...@@ -185,7 +185,7 @@ CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
CONFIG_FEATURE_TAR_TO_COMMAND=y CONFIG_FEATURE_TAR_TO_COMMAND=y
CONFIG_FEATURE_TAR_UNAME_GNAME=y CONFIG_FEATURE_TAR_UNAME_GNAME=y
CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y
# CONFIG_FEATURE_TAR_SELINUX is not set CONFIG_FEATURE_TAR_SELINUX=y
CONFIG_UNZIP=y CONFIG_UNZIP=y
CONFIG_FEATURE_UNZIP_CDF=y CONFIG_FEATURE_UNZIP_CDF=y
# CONFIG_FEATURE_UNZIP_BZIP2 is not set # CONFIG_FEATURE_UNZIP_BZIP2 is not set
...@@ -462,7 +462,7 @@ CONFIG_FEATURE_FIND_PRUNE=y ...@@ -462,7 +462,7 @@ CONFIG_FEATURE_FIND_PRUNE=y
CONFIG_FEATURE_FIND_DELETE=y CONFIG_FEATURE_FIND_DELETE=y
CONFIG_FEATURE_FIND_PATH=y CONFIG_FEATURE_FIND_PATH=y
CONFIG_FEATURE_FIND_REGEX=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_LINKS=y
CONFIG_FEATURE_FIND_EXECUTABLE=y CONFIG_FEATURE_FIND_EXECUTABLE=y
CONFIG_FEATURE_FIND_QUIT=y CONFIG_FEATURE_FIND_QUIT=y
......
...@@ -10,6 +10,9 @@ Source3: busybox-sailfish.config ...@@ -10,6 +10,9 @@ Source3: busybox-sailfish.config
Patch0: 0001-Copy-extended-attributes-if-p-flag-is-provided-to-cp.patch Patch0: 0001-Copy-extended-attributes-if-p-flag-is-provided-to-cp.patch
Patch1: 0002-applets-Busybox-in-usr-bin-instead-of-bin.patch Patch1: 0002-applets-Busybox-in-usr-bin-instead-of-bin.patch
URL: https://git.sailfishos.org/mer-core/busybox URL: https://git.sailfishos.org/mer-core/busybox
BuildRequires: glibc-static
BuildRequires: libselinux-static libsepol-static
BuildRequires: pcre-static
Obsoletes: time <= 1.7 Obsoletes: time <= 1.7
Provides: time > 1.7 Provides: time > 1.7
...@@ -18,8 +21,6 @@ Provides: time > 1.7 ...@@ -18,8 +21,6 @@ Provides: time > 1.7
Obsoletes: iputils <= 20101006 Obsoletes: iputils <= 20101006
Provides: iputils > 20101006 Provides: iputils > 20101006
BuildRequires: glibc-static
%define debug_package %{nil} %define debug_package %{nil}
%description %description
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment