From d7631bfb9fa928220e5306d2033d1459eee7a106 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 1 Jan 2018 13:35:26 +0100 Subject: make vendor specific info more customizeable --- Config.in | 6 ------ package/perl/Makefile | 2 +- target/config/Config.in.adk | 10 ++++++++++ toolchain/gcc/Makefile | 2 +- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Config.in b/Config.in index e30454432..eb4862f33 100644 --- a/Config.in +++ b/Config.in @@ -78,12 +78,6 @@ endmenu menu "Toolchain settings" visible if !ADK_TARGET_CHOOSE_ARCH -config ADK_VENDOR - string "Vendor name" - default "openadk" - help - Vendor string is used for toolchain. - source "target/config/Config.in.archopts" source "target/config/Config.in.fpu" source "target/config/Config.in.float" diff --git a/package/perl/Makefile b/package/perl/Makefile index 59b986b47..63b56c2c5 100644 --- a/package/perl/Makefile +++ b/package/perl/Makefile @@ -33,7 +33,7 @@ CONFIGURE_ARGS:= --target=$(GNU_TARGET_NAME) \ -Dccflags="$(TARGET_CFLAGS)" \ -Dldflags="$(TARGET_LDFLAGS) -lm" \ -Dmydomain="" \ - -Dmyuname="OpenADK" \ + -Dmyuname="$(ADK_VENDOR)" \ -Dosname=linux \ -Dosvers=4.0 \ -Dperladmin=root diff --git a/target/config/Config.in.adk b/target/config/Config.in.adk index 6d4b47ea3..9d9415afc 100644 --- a/target/config/Config.in.adk +++ b/target/config/Config.in.adk @@ -3,6 +3,16 @@ menu "Global settings" +config ADK_VENDOR + string "Vendor name" + default "openadk" + help + Vendor string is used for toolchain and other packages. + +config ADK_VENDOR_URL + string "Vendor url" + default "https://openadk.org" + config ADK_HOST string "webserver for packages and distfiles" default "openadk.org" diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index edd301297..b69cad2bd 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -27,7 +27,7 @@ TARGET_CXXFLAGS:= $(filter-out -static,$(TARGET_CXXFLAGS)) endif GCC_CONFOPTS:= --prefix=$(TOOLCHAIN_DIR)/usr \ - --with-bugurl="https://openadk.org/" \ + --with-bugurl="$(ADK_VENDOR_URL)" \ --build=$(GNU_HOST_NAME) \ --host=$(GNU_HOST_NAME) \ --target=$(GNU_TARGET_NAME) \ -- cgit v1.2.3