diff options
| author | Michael Brown <mcb30@ipxe.org> | 2012-11-02 14:46:39 +0000 |
|---|---|---|
| committer | Michael Brown <mcb30@ipxe.org> | 2012-11-02 14:46:39 +0000 |
| commit | 4867085c0cd334004e8d67dff7bd53996f23ade6 (patch) | |
| tree | 31f92c7844273c3b495c105a4c24d98dc54917ac /src/net | |
| parent | 0932bc5156bd88f773936ee5dac5d574ff921287 (diff) | |
| download | ipxe-4867085c0cd334004e8d67dff7bd53996f23ade6.tar.gz | |
[build] Include version number within only a single object file
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/tcp/httpcore.c | 5 | ||||
| -rw-r--r-- | src/net/udp/dhcp.c | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/net/tcp/httpcore.c b/src/net/tcp/httpcore.c index 7f178cc8..bccb35f5 100644 --- a/src/net/tcp/httpcore.c +++ b/src/net/tcp/httpcore.c @@ -48,6 +48,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <ipxe/md5.h> #include <ipxe/blockdev.h> #include <ipxe/acpi.h> +#include <ipxe/version.h> #include <ipxe/http.h> /* Disambiguate the various error causes */ @@ -1141,11 +1142,11 @@ static void http_step ( struct http_request *http ) { /* Send request */ if ( ( rc = xfer_printf ( &http->socket, "%s %s HTTP/1.1\r\n" - "User-Agent: iPXE/" VERSION "\r\n" + "User-Agent: iPXE/%s\r\n" "Host: %s%s%s\r\n" "%s%s%s" "\r\n", - method, uri, http->uri->host, + method, uri, product_version, http->uri->host, ( http->uri->port ? ":" : "" ), ( http->uri->port ? diff --git a/src/net/udp/dhcp.c b/src/net/udp/dhcp.c index e652503d..e63c3e42 100644 --- a/src/net/udp/dhcp.c +++ b/src/net/udp/dhcp.c @@ -91,9 +91,6 @@ static uint8_t dhcp_request_options_data[] = { DHCP_END }; -/** Version number feature */ -FEATURE_VERSION ( VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH ); - /** DHCP server address setting */ struct setting dhcp_server_setting __setting ( SETTING_MISC ) = { .name = "dhcp-server", |