You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
30 lines
1.1 KiB
30 lines
1.1 KiB
6 years ago
|
diff -u -r ../apk-tools-2.10.1/src/database.c ./src/database.c
|
||
|
|
--- ../apk-tools-2.10.1/src/database.c 2018-09-10 08:04:03.000000000 +0000
|
||
|
|
+++ ./src/database.c 2018-09-10 22:06:19.510417812 +0000
|
||
|
|
@@ -1331,7 +1331,7 @@
|
||
|
|
static int apk_db_create(struct apk_database *db)
|
||
|
|
{
|
||
|
|
int fd;
|
||
|
|
-
|
||
|
|
+#ifndef __ANDROID__
|
||
|
|
mkdirat(db->root_fd, "tmp", 01777);
|
||
|
|
mkdirat(db->root_fd, "dev", 0755);
|
||
|
|
mknodat(db->root_fd, "dev/null", S_IFCHR | 0666, makedev(1, 3));
|
||
|
|
@@ -1344,6 +1344,7 @@
|
||
|
|
mkdirat(db->root_fd, "var/cache", 0755);
|
||
|
|
mkdirat(db->root_fd, "var/cache/apk", 0755);
|
||
|
|
mkdirat(db->root_fd, "var/cache/misc", 0755);
|
||
|
|
+#endif
|
||
|
|
|
||
|
|
fd = openat(db->root_fd, apk_world_file, O_CREAT|O_RDWR|O_TRUNC|O_CLOEXEC, 0644);
|
||
|
|
if (fd < 0)
|
||
|
|
@@ -1529,7 +1530,7 @@
|
||
|
|
apk_db_setup_repositories(db, dbopts->cache_dir);
|
||
|
|
|
||
|
|
db->cache_max_age = dbopts->cache_max_age ?: 4*60*60; /* 4 hours default */
|
||
|
|
- db->root = strdup(dbopts->root ?: "/");
|
||
|
|
+ db->root = strdup(dbopts->root ?: "@TERMUX_PREFIX@");
|
||
|
|
db->root_fd = openat(AT_FDCWD, db->root, O_RDONLY | O_CLOEXEC);
|
||
|
|
if (db->root_fd < 0 && (dbopts->open_flags & APK_OPENF_CREATE)) {
|
||
|
|
mkdirat(AT_FDCWD, db->root, 0755);
|