oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pkg_install: forget about OS_RELEASE, just a properly formatted OS_VERSION.

Browse Source
This commit is contained in:
Ben Gras 2010-07-23 14:10:23 +00:00
parent 34a58c8d82
commit 1c4065cd10
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
commands/pkg_install/add/perform.c
View File

@ -504,8 +504,6 @@ read_buildinfo(struct pkg_task *pkg)
if (strncmp(data, "OPSYS=", 6) == 0) if (strncmp(data, "OPSYS=", 6) == 0)
pkg->buildinfo[BI_OPSYS] = dup_value(data, eol); 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) else if (strncmp(data, "OS_VERSION=", 11) == 0)
pkg->buildinfo[BI_OS_VERSION] = dup_value(data, eol); pkg->buildinfo[BI_OS_VERSION] = dup_value(data, eol);
else if (strncmp(data, "MACHINE_ARCH=", 13) == 0) 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); 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; fatal = 1;
if (fatal) { if (fatal) {
@ -915,7 +913,7 @@ check_platform(struct pkg_task *pkg)
warnx("%s/%s %s (pkg) vs. %s/%s %s (this host)", warnx("%s/%s %s (pkg) vs. %s/%s %s (this host)",
pkg->buildinfo[BI_OPSYS], pkg->buildinfo[BI_OPSYS],
pkg->buildinfo[BI_MACHINE_ARCH], pkg->buildinfo[BI_MACHINE_ARCH],
pkg->buildinfo[BI_OS_RELEASE], pkg->buildinfo[BI_OS_VERSION],
OPSYS_NAME, OPSYS_NAME,
effective_arch, effective_arch,
host_uname.release); host_uname.release);

1
commands/pkg_install/info/show.c
View File

@ -332,7 +332,6 @@ show_summary(struct pkg_meta *meta, package_t *plist, const char *binpkgfile)
"REQUIRES", "REQUIRES",
"PKG_OPTIONS", "PKG_OPTIONS",
"OPSYS", "OPSYS",
"OS_RELEASE",
"OS_VERSION", "OS_VERSION",
"MACHINE_ARCH", "MACHINE_ARCH",
"LICENSE", "LICENSE",

3
commands/pkg_install/lib/lib.h
View File

@ -187,8 +187,7 @@ typedef enum bi_ent_t {
BI_USE_ABI_DEPENDS, /* 4 */ BI_USE_ABI_DEPENDS, /* 4 */
BI_LICENSE, /* 5 */ BI_LICENSE, /* 5 */
BI_PKGTOOLS_VERSION, /* 6 */ BI_PKGTOOLS_VERSION, /* 6 */
BI_OS_RELEASE, /* 7 */ BI_ENUM_COUNT /* 7 */
BI_ENUM_COUNT /* 8 */
} bi_ent_t; } bi_ent_t;
/* Types */ /* Types */