diff options
Diffstat (limited to 'patches/dev300/build-identification.diff')
-rw-r--r-- | patches/dev300/build-identification.diff | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/patches/dev300/build-identification.diff b/patches/dev300/build-identification.diff deleted file mode 100644 index 435740615..000000000 --- a/patches/dev300/build-identification.diff +++ /dev/null @@ -1,50 +0,0 @@ ---- - scp2/source/ooo/common_brand.scp | 18 ++++++++++++++++++ - solenv/bin/modules/installer/scriptitems.pm | 2 ++ - 2 files changed, 20 insertions(+), 0 deletions(-) - -diff --git scp2/source/ooo/common_brand.scp scp2/source/ooo/common_brand.scp -index 0fffeaa..bec9817 100644 ---- scp2/source/ooo/common_brand.scp -+++ scp2/source/ooo/common_brand.scp -@@ -991,6 +991,24 @@ ProfileItem gid_Brand_Profileitem_Version_Useragent - Value = "<PRODUCT> (${buildid}; ${_OS}; ${_ARCH}; BundledLanguages=${AllLanguages})"; - End - -+ProfileItem gid_Brand_Profileitem_Version_Vendor -+ ProfileID = gid_Brand_Profile_Version_Ini; -+ ModuleID = gid_Module_Root_Brand; -+ Section = "Version"; -+ Order = 16; -+ Key = "Vendor"; -+ Value = "<vendor>"; -+End -+ -+ProfileItem gid_Brand_Profileitem_Version_BuildVersion -+ ProfileID = gid_Brand_Profile_Version_Ini; -+ ModuleID = gid_Module_Root_Brand; -+ Section = "Version"; -+ Order = 17; -+ Key = "BuildVersion"; -+ Value = "<buildversion>"; -+End -+ - ProfileItem gid_Brand_Profileitem_Version_Ooobaseversion - ProfileID = gid_Brand_Profile_Version_Ini; - ModuleID = gid_Module_Root_Brand; -diff --git solenv/bin/modules/installer/scriptitems.pm solenv/bin/modules/installer/scriptitems.pm -index 7b9b8de..0720f3a 100644 ---- solenv/bin/modules/installer/scriptitems.pm -+++ solenv/bin/modules/installer/scriptitems.pm -@@ -830,6 +830,8 @@ sub replace_setup_variables - $value =~ s/\<sourceid\>/$installer::globals::build/; - $value =~ s/\<updateid\>/$updateid/; - $value =~ s/\<pkgformat\>/$installer::globals::packageformat/; -+ $value =~ s/\<vendor\>/$ENV{'OOO_VENDOR'}/; -+ $value =~ s/\<buildversion\>/$ENV{'BUILD_VER_STRING'}/; - - $oneitem->{'Value'} = $value; - } --- -1.7.0.1 - |