| Index: chrome/installer/linux/rpm/build.sh
|
| diff --git a/chrome/installer/linux/rpm/build.sh b/chrome/installer/linux/rpm/build.sh
|
| index 4566e083a4e17836f957eebb1894d268a6aabd03..f58799b89223afc981408246abd4b3060aecaacd 100755
|
| --- a/chrome/installer/linux/rpm/build.sh
|
| +++ b/chrome/installer/linux/rpm/build.sh
|
| @@ -169,11 +169,12 @@ cleanup() {
|
|
|
| usage() {
|
| echo "usage: $(basename $0) [-c channel] [-a target_arch] [-o 'dir']"
|
| - echo " [-b 'dir']"
|
| + echo " [-b 'dir'] -d branding"
|
| echo "-c channel the package channel (trunk, asan, unstable, beta, stable)"
|
| echo "-a arch package architecture (ia32 or x64)"
|
| echo "-o dir package output directory [${OUTPUTDIR}]"
|
| echo "-b dir build input directory [${BUILDDIR}]"
|
| + echo "-d brand either chromium or google_chrome"
|
| echo "-h this help message"
|
| }
|
|
|
| @@ -214,7 +215,7 @@ verify_channel() {
|
| }
|
|
|
| process_opts() {
|
| - while getopts ":o:b:c:a:h" OPTNAME
|
| + while getopts ":o:b:c:a:d:h" OPTNAME
|
| do
|
| case $OPTNAME in
|
| o )
|
| @@ -231,6 +232,9 @@ process_opts() {
|
| a )
|
| TARGETARCH="$OPTARG"
|
| ;;
|
| + d )
|
| + BRANDING="$OPTARG"
|
| + ;;
|
| h )
|
| usage
|
| exit 0
|
| @@ -275,7 +279,7 @@ source ${BUILDDIR}/installer/common/installer.include
|
|
|
| get_version_info
|
|
|
| -if [ "$CHROMIUM_BUILD" = "_google_chrome" ]; then
|
| +if [ "$BRANDING" = "google_chrome" ]; then
|
| source "${BUILDDIR}/installer/common/google-chrome.info"
|
| else
|
| source "${BUILDDIR}/installer/common/chromium-browser.info"
|
|
|