Fixup UDB databases to fix a problem introduced with FreeBSD 10 patch.

The symbol hp-ux is used to tag files for installation on HP machines
in the UDB databases.  To ensure the correct release streams are
defined, these symbols (hp-ux, linux, freebsd, etc) are undef'd so
that they are not evaluated in the context of db file generation by
the preprocessor.

A change in the FreeBSD 10 patch disabled this, possibly due to
'hp-ux' being an invalid cpp symbol on FreeBSD 10 machines, which now
use clang by default.

Undefining these cpp symbols is actually required, otherwise linux,
for example, is defined as a '1' in the generated databases, which
will not match the release stream name 'linux', therefore all of the
files tagged as 'linux' are never installed.

To fix this, revert the change made in the FreeBSD 10 patch, and
rename all occurances of 'hp-ux' to 'hpux' in the UDB files to avoid
the potential for cpp trouble when hp-ux is specified.

As a result of this change, 'hpux' is now the name of the release
stream for hp machines, not 'hp-ux'.
This commit is contained in:
Jon Trulson
2014-07-27 13:44:35 -06:00
parent c3f74eec17
commit 9b5b547a34
20 changed files with 237 additions and 243 deletions

View File

@@ -4,10 +4,10 @@
#--------------------------------
#
#>>------------------------------
# Defaults for: hp-ux
# Defaults for: hpux
#<<------------------------------
#
{ hp-ux : defaults
{ hpux : defaults
install_target =
fileset = CDE-RUN
type = file
@@ -25,7 +25,7 @@
responsible_project = cde_dt
}
#>>------------------------------
# Defaults for: hp-ux 10.0
# Defaults for: hpux 10.0
#<<------------------------------
#
{ hpV4 : defaults
@@ -146,7 +146,7 @@
group = bin
}
#>>-------------------------------------------------
# Defaults for: everything else (identical to hp-ux)
# Defaults for: everything else (identical to hpux)
#<<-------------------------------------------------
#
{ default : defaults
@@ -179,7 +179,7 @@ programs/dtlogin/config/Xfailsafe
}
#
programs/dtconfig/hp/dtrc
{ hp-ux
{ hpux
install_target = /usr/dt/bin/dtrc
mode = 0544
}
@@ -527,7 +527,7 @@ programs/localized/C/config/dtfile.config
}
programs/util/scripts/convertvf
{ hp-ux
{ hpux
install_target = /usr/dt/bin/dtconvertvf
mode = 0555
}
@@ -1175,10 +1175,10 @@ programs/dtlogin/dtgreet
mode = 0544
}
#
# Create hpterm link on hp-ux only
# Create hpterm link on hpux only
#
/usr/bin/X11/hpterm
{ hp-ux
{ hpux
install_target = /usr/dt/bin/hpterm
owner = root
type = sym_link
@@ -1214,7 +1214,7 @@ programs/dtaction/dtaction
}
#
programs/dtaction/dtaction
{ hp-ux
{ hpux
install_target = /usr/dt/bin/dtaction
owner = root
group = sys
@@ -1589,7 +1589,7 @@ programs/localized/C/types/dthelp.dt
}
#
#programs/localized/C/types/hp.dt
#{ hp-ux
#{ hpux
# install_target = /usr/dt/appconfig/types/C/hp.dt
#}
#