jaiden
/
apk-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use APK_DEFAULT_ABI_TAG everywhere APK_DEFAULT_ARCH was previously used

cute-signatures
Ariadne Conill 2022-01-13 08:26:51 -06:00 committed by Timo Teräs
parent fee0587660
commit c29638cd81
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/apk.c
View File

@ -48,7 +48,7 @@ time_t time(time_t *tloc)
static void version(struct apk_out *out, const char *prefix) static void version(struct apk_out *out, const char *prefix)
{ {
apk_out_fmt(out, prefix, "apk-tools " APK_VERSION ", compiled for " APK_DEFAULT_ARCH "."); apk_out_fmt(out, prefix, "apk-tools " APK_VERSION ", compiled for " APK_DEFAULT_ABI_TAG ".");
#ifdef TEST_MODE #ifdef TEST_MODE
apk_out_fmt(out, prefix, "TEST MODE BUILD. NOT FOR PRODUCTION USE."); apk_out_fmt(out, prefix, "TEST MODE BUILD. NOT FOR PRODUCTION USE.");
#endif #endif
@ -201,7 +201,7 @@ static int option_parse_global(void *ctx, struct apk_ctx *ac, int opt, const cha
ac->arch = optarg; ac->arch = optarg;
break; break;
case OPT_GLOBAL_print_arch: case OPT_GLOBAL_print_arch:
puts(APK_DEFAULT_ARCH); puts(APK_DEFAULT_ABI_TAG);
return -ESHUTDOWN; return -ESHUTDOWN;
#ifdef TEST_MODE #ifdef TEST_MODE
case OPT_GLOBAL_test_repo: case OPT_GLOBAL_test_repo:

2
src/app_mkpkg.c
View File

@ -263,7 +263,7 @@ static int mkpkg_main(void *pctx, struct apk_ctx *ac, struct apk_string_array *a
} }
} }
if (adb_ro_val(&pkgi, ADBI_PI_ARCH) == ADB_VAL_NULL) if (adb_ro_val(&pkgi, ADBI_PI_ARCH) == ADB_VAL_NULL)
adb_wo_blob(&pkgi, ADBI_PI_ARCH, APK_BLOB_STRLIT(APK_DEFAULT_ARCH)); adb_wo_blob(&pkgi, ADBI_PI_ARCH, APK_BLOB_STRLIT(APK_DEFAULT_ABI_TAG));
// scan and add all files // scan and add all files
if (ctx->files_dir) { if (ctx->files_dir) {

2
src/database.c
View File

@ -1680,7 +1680,7 @@ int apk_db_open(struct apk_database *db, struct apk_ctx *ac)
db->arch = apk_atomize_dup(&db->atoms, apk_blob_trim(arch)); db->arch = apk_atomize_dup(&db->atoms, apk_blob_trim(arch));
free(arch.ptr); free(arch.ptr);
} else { } else {
db->arch = apk_atomize(&db->atoms, APK_BLOB_STR(APK_DEFAULT_ARCH)); db->arch = apk_atomize(&db->atoms, APK_BLOB_STR(APK_DEFAULT_ABI_TAG));
db->write_arch = 1; db->write_arch = 1;
} }
} }