netease
/
SmartAudio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
SmartAudio/tools/e2fsprogs/patches/100-compile-e2fsdroid-tools...

241 lines
7.7 KiB
Diff
Executable File
Raw Blame History

diff -Naur e2fsprogs-1.44.3-bak/contrib/android/e2fsdroid.c e2fsprogs-1.44.3/contrib/android/e2fsdroid.c
--- e2fsprogs-1.44.3-bak/contrib/android/e2fsdroid.c 2018-08-23 16:34:26.781228044 +0800
+++ e2fsprogs-1.44.3/contrib/android/e2fsdroid.c 2018-08-23 16:34:43.000000000 +0800
@@ -36,6 +36,7 @@
static char *src_dir;
static int android_configure;
static int android_sparse_file = 1;
+int no_copy_xattrs = 1;
static void usage(int ret)
{
diff -Naur e2fsprogs-1.44.3-bak/contrib/android/Makefile e2fsprogs-1.44.3/contrib/android/Makefile
--- e2fsprogs-1.44.3-bak/contrib/android/Makefile 1970-01-01 08:00:00.000000000 +0800
+++ e2fsprogs-1.44.3/contrib/android/Makefile 2018-08-23 16:15:08.000000000 +0800
@@ -0,0 +1,37 @@
+TARGET = e2fsdroid
+
+INCLUDES += -I. \
+ -I../../include \
+ -I../../lib \
+ -I../../lib/ext2fs \
+ -I../../misc
+
+SRCS := e2fsdroid.c \
+ block_range.c \
+ fsmap.c \
+ block_list.c \
+ base_fs.c \
+ perms.c \
+ basefs_allocator.c \
+ ../../misc/create_inode.c
+
+SUB_LIB := ../../lib/libcom_err.a \
+ ../../lib/ext2fs/libext2fs.a \
+ ../../lib/e2p/libe2p.a \
+ ../../lib/support/libsupport.a \
+ ../../lib/uuid/libuuid.a
+
+
+
+
+OBJS = $(SRCS:.c=.o)
+
+%.o: %.c
+ $(CC) $(CFLAGS) $(LOCAL_CFLAGS) $(INCLUDES) -c -o $@ $<
+
+$(TARGET): $(OBJS)
+ $(CC) $(LDFLAGS) $(OBJS) $(SUB_LIB) -lpcre -lselinux -lpthread -o $@
+
+clean:
+ rm -rf $(TARGET) $(OBJS)
+
diff -Naur e2fsprogs-1.44.3-bak/contrib/android/perms.c e2fsprogs-1.44.3/contrib/android/perms.c
--- e2fsprogs-1.44.3-bak/contrib/android/perms.c 2018-08-23 16:34:26.781228044 +0800
+++ e2fsprogs-1.44.3/contrib/android/perms.c 2018-08-23 16:34:48.000000000 +0800
@@ -343,7 +343,7 @@
return -EINVAL;
}
#endif
-
+#if 0
/* Load the FS config */
if (fs_config_file) {
retval = load_canned_fs_config(fs_config_file);
@@ -356,7 +356,7 @@
fs_config_func = canned_fs_config;
} else if (mountpoint)
fs_config_func = fs_config;
-
+#endif
return __android_configure_fs(fs, src_dir, target_out, mountpoint,
fs_config_func, sehnd, fixed_time,
uid_map, gid_map);
diff -Naur e2fsprogs-1.44.3-bak/contrib/android/perms.h e2fsprogs-1.44.3/contrib/android/perms.h
--- e2fsprogs-1.44.3-bak/contrib/android/perms.h 2018-08-23 16:34:26.781228044 +0800
+++ e2fsprogs-1.44.3/contrib/android/perms.h 2018-08-23 16:34:53.000000000 +0800
@@ -48,9 +48,10 @@
# include <selinux/label.h>
# if defined(__ANDROID__)
# include <selinux/android.h>
+# include <private/android_filesystem_config.h>
# endif
-# include <private/android_filesystem_config.h>
-# include <private/canned_fs_config.h>
+# include <private/android_filesystem_capability.h>
+# include <private/canned_fs_config.h>
errcode_t android_configure_fs(ext2_filsys fs, char *src_dir,
char *target_out,
diff -Naur e2fsprogs-1.44.3-bak/contrib/android/private/android_filesystem_capability.h e2fsprogs-1.44.3/contrib/android/private/android_filesystem_capability.h
--- e2fsprogs-1.44.3-bak/contrib/android/private/android_filesystem_capability.h 1970-01-01 08:00:00.000000000 +0800
+++ e2fsprogs-1.44.3/contrib/android/private/android_filesystem_capability.h 2018-08-23 15:55:46.000000000 +0800
@@ -0,0 +1,117 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * Taken from linux/capability.h, with minor modifications
+ */
+
+#ifndef _SYSTEM_CORE_INCLUDE_PRIVATE_ANDROID_FILESYSTEM_CAPABILITY_H
+#define _SYSTEM_CORE_INCLUDE_PRIVATE_ANDROID_FILESYSTEM_CAPABILITY_H
+
+#include <stdint.h>
+
+#define __user
+#define __u32 uint32_t
+#define __le32 uint32_t
+
+#define _LINUX_CAPABILITY_VERSION_1 0x19980330
+#define _LINUX_CAPABILITY_U32S_1 1
+#define _LINUX_CAPABILITY_VERSION_2 0x20071026
+#define _LINUX_CAPABILITY_U32S_2 2
+#define _LINUX_CAPABILITY_VERSION_3 0x20080522
+#define _LINUX_CAPABILITY_U32S_3 2
+
+typedef struct __user_cap_header_struct {
+ __u32 version;
+ int pid;
+} __user *cap_user_header_t;
+
+typedef struct __user_cap_data_struct {
+ __u32 effective;
+ __u32 permitted;
+ __u32 inheritable;
+} __user *cap_user_data_t;
+
+#define VFS_CAP_REVISION_MASK 0xFF000000
+#define VFS_CAP_REVISION_SHIFT 24
+#define VFS_CAP_FLAGS_MASK ~VFS_CAP_REVISION_MASK
+#define VFS_CAP_FLAGS_EFFECTIVE 0x000001
+#define VFS_CAP_REVISION_1 0x01000000
+#define VFS_CAP_U32_1 1
+#define XATTR_CAPS_SZ_1 (sizeof(__le32)*(1 + 2*VFS_CAP_U32_1))
+#define VFS_CAP_REVISION_2 0x02000000
+#define VFS_CAP_U32_2 2
+#define XATTR_CAPS_SZ_2 (sizeof(__le32)*(1 + 2*VFS_CAP_U32_2))
+#define XATTR_CAPS_SZ XATTR_CAPS_SZ_2
+#define VFS_CAP_U32 VFS_CAP_U32_2
+#define VFS_CAP_REVISION VFS_CAP_REVISION_2
+
+struct vfs_cap_data {
+ __le32 magic_etc;
+ struct {
+ __le32 permitted;
+ __le32 inheritable;
+ } data[VFS_CAP_U32];
+};
+
+#define _LINUX_CAPABILITY_VERSION _LINUX_CAPABILITY_VERSION_1
+#define _LINUX_CAPABILITY_U32S _LINUX_CAPABILITY_U32S_1
+#define CAP_CHOWN 0
+#define CAP_DAC_OVERRIDE 1
+#define CAP_DAC_READ_SEARCH 2
+#define CAP_FOWNER 3
+#define CAP_FSETID 4
+#define CAP_KILL 5
+#define CAP_SETGID 6
+#define CAP_SETUID 7
+#define CAP_SETPCAP 8
+#define CAP_LINUX_IMMUTABLE 9
+#define CAP_NET_BIND_SERVICE 10
+#define CAP_NET_BROADCAST 11
+#define CAP_NET_ADMIN 12
+#define CAP_NET_RAW 13
+#define CAP_IPC_LOCK 14
+#define CAP_IPC_OWNER 15
+#define CAP_SYS_MODULE 16
+#define CAP_SYS_RAWIO 17
+#define CAP_SYS_CHROOT 18
+#define CAP_SYS_PTRACE 19
+#define CAP_SYS_PACCT 20
+#define CAP_SYS_ADMIN 21
+#define CAP_SYS_BOOT 22
+#define CAP_SYS_NICE 23
+#define CAP_SYS_RESOURCE 24
+#define CAP_SYS_TIME 25
+#define CAP_SYS_TTY_CONFIG 26
+#define CAP_MKNOD 27
+#define CAP_LEASE 28
+#define CAP_AUDIT_WRITE 29
+#define CAP_AUDIT_CONTROL 30
+#define CAP_SETFCAP 31
+#define CAP_MAC_OVERRIDE 32
+#define CAP_MAC_ADMIN 33
+#define CAP_SYSLOG 34
+#define CAP_WAKE_ALARM 35
+#define CAP_LAST_CAP CAP_WAKE_ALARM
+#define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP)
+#define CAP_TO_INDEX(x) ((x) >> 5)
+#define CAP_TO_MASK(x) (1 << ((x) & 31))
+
+#undef __user
+#undef __u32
+#undef __le32
+
+#endif
diff -Naur e2fsprogs-1.44.3-bak/contrib/android/private/canned_fs_config.h e2fsprogs-1.44.3/contrib/android/private/canned_fs_config.h
--- e2fsprogs-1.44.3-bak/contrib/android/private/canned_fs_config.h 1970-01-01 08:00:00.000000000 +0800
+++ e2fsprogs-1.44.3/contrib/android/private/canned_fs_config.h 2018-08-23 15:55:46.000000000 +0800
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _CANNED_FS_CONFIG_H
+#define _CANNED_FS_CONFIG_H
+
+#include <inttypes.h>
+
+int load_canned_fs_config(const char* fn);
+int canned_fs_config(const char* path, int dir,
+ unsigned* uid, unsigned* gid, unsigned* mode, uint64_t* capabilities);
+
+#endif
Reference in New Issue View Git Blame Copy Permalink