From 1c4065cd10892e6ba4775625b1811e3188e8e29e Mon Sep 17 00:00:00 2001 From: Ben Gras Date: Fri, 23 Jul 2010 14:10:23 +0000 Subject: [PATCH] pkg_install: forget about OS_RELEASE, just a properly formatted OS_VERSION. --- commands/pkg_install/add/perform.c | 6 ++---- commands/pkg_install/info/show.c | 1 - commands/pkg_install/lib/lib.h | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/commands/pkg_install/add/perform.c b/commands/pkg_install/add/perform.c index 3ffd48d74..c43f43657 100644 --- a/commands/pkg_install/add/perform.c +++ b/commands/pkg_install/add/perform.c @@ -504,8 +504,6 @@ read_buildinfo(struct pkg_task *pkg) if (strncmp(data, "OPSYS=", 6) == 0) pkg->buildinfo[BI_OPSYS] = dup_value(data, eol); - else if (strncmp(data, "OS_RELEASE=", 11) == 0) - pkg->buildinfo[BI_OS_RELEASE] = dup_value(data, eol); else if (strncmp(data, "OS_VERSION=", 11) == 0) pkg->buildinfo[BI_OS_VERSION] = dup_value(data, eol); else if (strncmp(data, "MACHINE_ARCH=", 13) == 0) @@ -906,7 +904,7 @@ check_platform(struct pkg_task *pkg) normalise_version(host_uname.release, host_uname.version); - if (strcmp(host_uname.release, pkg->buildinfo[BI_OS_RELEASE]) != 0) + if (strcmp(host_uname.release, pkg->buildinfo[BI_OS_VERSION]) != 0) fatal = 1; if (fatal) { @@ -915,7 +913,7 @@ check_platform(struct pkg_task *pkg) warnx("%s/%s %s (pkg) vs. %s/%s %s (this host)", pkg->buildinfo[BI_OPSYS], pkg->buildinfo[BI_MACHINE_ARCH], - pkg->buildinfo[BI_OS_RELEASE], + pkg->buildinfo[BI_OS_VERSION], OPSYS_NAME, effective_arch, host_uname.release); diff --git a/commands/pkg_install/info/show.c b/commands/pkg_install/info/show.c index c18248616..99056739a 100644 --- a/commands/pkg_install/info/show.c +++ b/commands/pkg_install/info/show.c @@ -332,7 +332,6 @@ show_summary(struct pkg_meta *meta, package_t *plist, const char *binpkgfile) "REQUIRES", "PKG_OPTIONS", "OPSYS", - "OS_RELEASE", "OS_VERSION", "MACHINE_ARCH", "LICENSE", diff --git a/commands/pkg_install/lib/lib.h b/commands/pkg_install/lib/lib.h index 7d0f23122..13e0386be 100644 --- a/commands/pkg_install/lib/lib.h +++ b/commands/pkg_install/lib/lib.h @@ -187,8 +187,7 @@ typedef enum bi_ent_t { BI_USE_ABI_DEPENDS, /* 4 */ BI_LICENSE, /* 5 */ BI_PKGTOOLS_VERSION, /* 6 */ - BI_OS_RELEASE, /* 7 */ - BI_ENUM_COUNT /* 8 */ + BI_ENUM_COUNT /* 7 */ } bi_ent_t; /* Types */ -- 2.44.0