diff options
| author | Ariadne Conill <ariadne@dereferenced.org> | 2022-01-13 08:26:51 -0600 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2022-03-30 09:17:25 +0000 |
| commit | c29638cd8143e624012041acb24fc4dc94d6121b (patch) | |
| tree | 8bec077a8dba230b306992c1e6340e4fcfd994bb | |
| parent | fee0587660993f85111ac8bb0cde3bf159936be2 (diff) | |
| download | apk-tools-c29638cd8143e624012041acb24fc4dc94d6121b.tar.gz apk-tools-c29638cd8143e624012041acb24fc4dc94d6121b.tar.bz2 apk-tools-c29638cd8143e624012041acb24fc4dc94d6121b.tar.xz apk-tools-c29638cd8143e624012041acb24fc4dc94d6121b.zip | |
use APK_DEFAULT_ABI_TAG everywhere APK_DEFAULT_ARCH was previously used
| -rw-r--r-- | src/apk.c | 4 | ||||
| -rw-r--r-- | src/app_mkpkg.c | 2 | ||||
| -rw-r--r-- | src/database.c | 2 |
3 files changed, 4 insertions, 4 deletions
@@ -48,7 +48,7 @@ time_t time(time_t *tloc) 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 apk_out_fmt(out, prefix, "TEST MODE BUILD. NOT FOR PRODUCTION USE."); #endif @@ -201,7 +201,7 @@ static int option_parse_global(void *ctx, struct apk_ctx *ac, int opt, const cha ac->arch = optarg; break; case OPT_GLOBAL_print_arch: - puts(APK_DEFAULT_ARCH); + puts(APK_DEFAULT_ABI_TAG); return -ESHUTDOWN; #ifdef TEST_MODE case OPT_GLOBAL_test_repo: diff --git a/src/app_mkpkg.c b/src/app_mkpkg.c index e085090..3272613 100644 --- a/src/app_mkpkg.c +++ b/src/app_mkpkg.c @@ -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) - 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 if (ctx->files_dir) { diff --git a/src/database.c b/src/database.c index 6758e98..113597f 100644 --- a/src/database.c +++ b/src/database.c @@ -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)); free(arch.ptr); } 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; } } |