diff options
Diffstat (limited to 'package/utils/f2fs-tools/patches/020-no_selinux.patch')
| -rw-r--r-- | package/utils/f2fs-tools/patches/020-no_selinux.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/package/utils/f2fs-tools/patches/020-no_selinux.patch b/package/utils/f2fs-tools/patches/020-no_selinux.patch new file mode 100644 index 0000000000..dcb3bd24c4 --- /dev/null +++ b/package/utils/f2fs-tools/patches/020-no_selinux.patch @@ -0,0 +1,55 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -49,7 +49,7 @@ AC_PATH_PROG([LDCONFIG], [ldconfig], + + # Checks for libraries. + PKG_CHECK_MODULES([libuuid], [uuid]) +-PKG_CHECK_MODULES([libselinux], [libselinux]) ++# PKG_CHECK_MODULES([libselinux], [libselinux]) + + # Checks for header files. + AC_CHECK_HEADERS([linux/fs.h fcntl.h mntent.h stdlib.h string.h \ +--- a/fsck/sload.c ++++ b/fsck/sload.c +@@ -16,10 +16,11 @@ + #include <libgen.h> + #include <dirent.h> + #include <mntent.h> ++ ++#ifdef WITH_ANDROID + #include <selinux/selinux.h> + #include <selinux/label.h> + +-#ifdef WITH_ANDROID + #include <selinux/label.h> + #include <private/android_filesystem_config.h> + +@@ -110,10 +111,12 @@ static int build_directory(struct f2fs_s + handle_selabel(dentries + i, S_ISDIR(stat.st_mode), + target_out_dir); + ++#ifdef WITH_ANDROID + if (sehnd && selabel_lookup(sehnd, &dentries[i].secon, + dentries[i].path, stat.st_mode) < 0) + ERR_MSG("Cannot lookup security context for %s\n", + dentries[i].path); ++#endif + + dentries[i].pino = dir_ino; + +@@ -218,6 +221,7 @@ int f2fs_sload(struct f2fs_sb_info *sbi, + return ret; + } + ++#ifdef WITH_ANDROID + if (sehnd) { + char *secontext = NULL; + +@@ -233,6 +237,7 @@ int f2fs_sload(struct f2fs_sb_info *sbi, + } + free(secontext); + } ++#endif + + /* update curseg info; can update sit->types */ + move_curseg_info(sbi, SM_I(sbi)->main_blkaddr); |