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

diff --git a/commands/pkg_install/add/perform.c b/commands/pkg_install/add/perform.c
index 3ffd48d740a7a6edea8d1fbbb713fabf05ed7b4a..c43f4365731dd4b4dc731ab5d3adcf58af2d24a5 100644 (file)
--- 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 c18248616fd194770dbbdbe8a8dd3fc422ea8a0a..99056739a28e6e2132945d604da0219d5493fba1 100644 (file)
--- 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 7d0f2312259329090b17b54a02a799fed4f4a593..13e0386be8b4b693a71d122d11d0e6408cee4ad1 100644 (file)
--- 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 */