opensourcemirror
/
opnsense-tools
mirror of https://github.com/opnsense/tools.git
1
0
Fork 0
Code Issues Releases Wiki Activity

build: fix argument scrubbing, remove obsolete gettext-tools from core

This commit is contained in:
Franco Fichtner 2017-04-27 19:14:36 +02:00
parent a420970cf5
commit df43aa9126
27 changed files with 41 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/base.sh
View File

@ -29,7 +29,7 @@ set -e
SELF=base SELF=base
. ./common.sh && $(${SCRUB_ARGS}) . ./common.sh
BASE_SET=$(find ${SETSDIR} -name "base-*-${PRODUCT_ARCH}.txz") BASE_SET=$(find ${SETSDIR} -name "base-*-${PRODUCT_ARCH}.txz")

4
build/boot.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# Copyright (c) 2016 Franco Fichtner <franco@opnsense.org> # Copyright (c) 2016-2107 Franco Fichtner <franco@opnsense.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions # modification, are permitted provided that the following conditions
@ -29,7 +29,7 @@ set -e
SELF=boot SELF=boot
. ./common.sh && $(${SCRUB_ARGS}) . ./common.sh
if [ -z "${1}" ]; then if [ -z "${1}" ]; then
echo ">> No image given." echo ">> No image given."

4
build/chroot.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# Copyright (c) 2016 Franco Fichtner <franco@opnsense.org> # Copyright (c) 2016-2017 Franco Fichtner <franco@opnsense.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions # modification, are permitted provided that the following conditions
@ -29,7 +29,7 @@ set -e
SELF=chroot SELF=chroot
. ./common.sh && $(${SCRUB_ARGS}) . ./common.sh
echo ">>> chroot'ing into ${STAGEDIR}/${1}..." echo ">>> chroot'ing into ${STAGEDIR}/${1}..."

2
build/clean.sh
View File

@ -29,7 +29,7 @@ set -e
SELF=clean SELF=clean
. ./common.sh && $(${SCRUB_ARGS}) . ./common.sh
for ARG in ${@}; do for ARG in ${@}; do
case ${ARG} in case ${ARG} in

33
build/common.sh
View File

@ -29,7 +29,6 @@
set -e set -e
OPTS="a:B:b:C:c:d:E:e:F:f:G:g:K:k:L:l:m:n:o:P:p:R:S:s:T:t:U:u:v:V:" OPTS="a:B:b:C:c:d:E:e:F:f:G:g:K:k:L:l:m:n:o:P:p:R:S:s:T:t:U:u:v:V:"
SCRUB_ARGS=":"
while getopts ${OPTS} OPT; do while getopts ${OPTS} OPT; do
case ${OPT} in case ${OPT} in
@ -37,123 +36,96 @@ while getopts ${OPTS} OPT; do
export PRODUCT_TARGET=${OPTARG%%:*} export PRODUCT_TARGET=${OPTARG%%:*}
export PRODUCT_ARCH=${OPTARG##*:} export PRODUCT_ARCH=${OPTARG##*:}
export PRODUCT_HOST=$(uname -p) export PRODUCT_HOST=$(uname -p)
SCRUB_ARGS=${SCRUB_ARGS};shift;shift
;; ;;
B) B)
export PORTSBRANCH=${OPTARG} export PORTSBRANCH=${OPTARG}
SCRUB_ARGS=${SCRUB_ARGS};shift;shift
;; ;;
b) b)
export SRCBRANCH=${OPTARG} export SRCBRANCH=${OPTARG}
SCRUB_ARGS=${SCRUB_ARGS};shift;shift
;; ;;
C) C)
export COREDIR=${OPTARG} export COREDIR=${OPTARG}
SCRUB_ARGS=${SCRUB_ARGS};shift;shift
;; ;;
c) c)
export PRODUCT_SPEED=${OPTARG} export PRODUCT_SPEED=${OPTARG}
SCRUB_ARGS=${SCRUB_ARGS};shift;shift
;; ;;
d) d)
export PRODUCT_DEVICE=${OPTARG} export PRODUCT_DEVICE=${OPTARG}
SCRUB_ARGS=${SCRUB_ARGS};shift;shift
;; ;;
E) E)
export COREBRANCH=${OPTARG} export COREBRANCH=${OPTARG}
SCRUB_ARGS=${SCRUB_ARGS};shift;shift
;; ;;
e) e)
export PLUGINSBRANCH=${OPTARG} export PLUGINSBRANCH=${OPTARG}
SCRUB_ARGS=${SCRUB_ARGS};shift;shift
;; ;;
F) F)
export PRODUCT_KERNEL=${OPTARG} export PRODUCT_KERNEL=${OPTARG}
SCRUB_ARGS=${SCRUB_ARGS};shift;shift
;; ;;
f) f)
export PRODUCT_FLAVOUR=${OPTARG} export PRODUCT_FLAVOUR=${OPTARG}
SCRUB_ARGS=${SCRUB_ARGS};shift;shift
;; ;;
G) G)
export PORTSREFBRANCH=${OPTARG} export PORTSREFBRANCH=${OPTARG}
SCRUB_ARGS=${SCRUB_ARGS};shift;shift
;; ;;
g) g)
export TOOLSBRANCH=${OPTARG} export TOOLSBRANCH=${OPTARG}
SCRUB_ARGS=${SCRUB_ARGS};shift;shift
;; ;;
K) K)
if [ -n "${OPTARG}" ]; then if [ -n "${OPTARG}" ]; then
export PRODUCT_PUBKEY=${OPTARG} export PRODUCT_PUBKEY=${OPTARG}
fi fi
SCRUB_ARGS=${SCRUB_ARGS};shift;shift
;; ;;
k) k)
if [ -n "${OPTARG}" ]; then if [ -n "${OPTARG}" ]; then
export PRODUCT_PRIVKEY=${OPTARG} export PRODUCT_PRIVKEY=${OPTARG}
fi fi
SCRUB_ARGS=${SCRUB_ARGS};shift;shift
;; ;;
L) L)
if [ -n "${OPTARG}" ]; then if [ -n "${OPTARG}" ]; then
export PRODUCT_SIGNCMD=${OPTARG} export PRODUCT_SIGNCMD=${OPTARG}
fi fi
SCRUB_ARGS=${SCRUB_ARGS};shift;shift
;; ;;
l) l)
if [ -n "${OPTARG}" ]; then if [ -n "${OPTARG}" ]; then
export PRODUCT_SIGNCHK=${OPTARG} export PRODUCT_SIGNCHK=${OPTARG}
fi fi
SCRUB_ARGS=${SCRUB_ARGS};shift;shift
;; ;;
m) m)
export PRODUCT_MIRROR=${OPTARG} export PRODUCT_MIRROR=${OPTARG}
SCRUB_ARGS=${SCRUB_ARGS};shift;shift
;; ;;
n) n)
export PRODUCT_NAME=${OPTARG} export PRODUCT_NAME=${OPTARG}
SCRUB_ARGS=${SCRUB_ARGS};shift;shift
;; ;;
o) o)
if [ -n "${OPTARG}" ]; then if [ -n "${OPTARG}" ]; then
export STAGEDIRPREFIX=${OPTARG} export STAGEDIRPREFIX=${OPTARG}
fi fi
SCRUB_ARGS=${SCRUB_ARGS};shift;shift
;; ;;
P) P)
export PORTSDIR=${OPTARG} export PORTSDIR=${OPTARG}
SCRUB_ARGS=${SCRUB_ARGS};shift;shift
;; ;;
p) p)
export PLUGINSDIR=${OPTARG} export PLUGINSDIR=${OPTARG}
SCRUB_ARGS=${SCRUB_ARGS};shift;shift
;; ;;
R) R)
export PORTSREFDIR=${OPTARG} export PORTSREFDIR=${OPTARG}
SCRUB_ARGS=${SCRUB_ARGS};shift;shift
;; ;;
S) S)
export SRCDIR=${OPTARG} export SRCDIR=${OPTARG}
SCRUB_ARGS=${SCRUB_ARGS};shift;shift
;; ;;
s) s)
export PRODUCT_SETTINGS=${OPTARG} export PRODUCT_SETTINGS=${OPTARG}
SCRUB_ARGS=${SCRUB_ARGS};shift;shift
;; ;;
T) T)
export TOOLSDIR=${OPTARG} export TOOLSDIR=${OPTARG}
SCRUB_ARGS=${SCRUB_ARGS};shift;shift
;; ;;
t) t)
export PRODUCT_TYPE=${OPTARG} export PRODUCT_TYPE=${OPTARG}
SCRUB_ARGS=${SCRUB_ARGS};shift;shift
;; ;;
U) U)
case "${OPTARG}" in case "${OPTARG}" in
''|-devel) ''|-devel)
export PRODUCT_SUFFIX=${OPTARG} export PRODUCT_SUFFIX=${OPTARG}
SCRUB_ARGS=${SCRUB_ARGS};shift;shift
;; ;;
*) *)
echo "SUFFIX wants empty string or '-devel'" >&2 echo "SUFFIX wants empty string or '-devel'" >&2
@ -165,15 +137,12 @@ while getopts ${OPTS} OPT; do
if [ "${OPTARG}" = "yes" ]; then if [ "${OPTARG}" = "yes" ]; then
export PRODUCT_UEFI=${OPTARG} export PRODUCT_UEFI=${OPTARG}
fi fi
SCRUB_ARGS=${SCRUB_ARGS};shift;shift
;; ;;
v) v)
export PRODUCT_VERSION=${OPTARG} export PRODUCT_VERSION=${OPTARG}
SCRUB_ARGS=${SCRUB_ARGS};shift;shift
;; ;;
V) V)
export PRODUCT_ADDITIONS=${OPTARG} export PRODUCT_ADDITIONS=${OPTARG}
SCRUB_ARGS=${SCRUB_ARGS};shift;shift
;; ;;
*) *)
echo "${0}: Unknown argument '${OPT}'" >&2 echo "${0}: Unknown argument '${OPT}'" >&2
@ -182,6 +151,8 @@ while getopts ${OPTS} OPT; do
esac esac
done done
shift $((${OPTIND} - 1))
if [ -z "${PRODUCT_NAME}" -o \ if [ -z "${PRODUCT_NAME}" -o \
-z "${PRODUCT_TYPE}" -o \ -z "${PRODUCT_TYPE}" -o \
-z "${PRODUCT_ARCH}" -o \ -z "${PRODUCT_ARCH}" -o \

6
build/core.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# Copyright (c) 2014-2016 Franco Fichtner <franco@opnsense.org> # Copyright (c) 2014-2017 Franco Fichtner <franco@opnsense.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions # modification, are permitted provided that the following conditions
@ -29,7 +29,7 @@ set -e
SELF=core SELF=core
. ./common.sh && $(${SCRUB_ARGS}) . ./common.sh
check_packages ${SELF} ${@} check_packages ${SELF} ${@}
@ -40,7 +40,7 @@ setup_chroot ${STAGEDIR}
extract_packages ${STAGEDIR} extract_packages ${STAGEDIR}
remove_packages ${STAGEDIR} ${@} remove_packages ${STAGEDIR} ${@}
# register persistent packages to avoid bouncing # register persistent packages to avoid bouncing
install_packages ${STAGEDIR} pkg git gettext-tools install_packages ${STAGEDIR} pkg git
lock_packages ${STAGEDIR} lock_packages ${STAGEDIR}
for BRANCH in master ${COREBRANCH}; do for BRANCH in master ${COREBRANCH}; do

2
build/distfiles.sh
View File

@ -29,7 +29,7 @@ set -e
SELF=distfiles SELF=distfiles
. ./common.sh && $(${SCRUB_ARGS}) . ./common.sh
PORTS_LIST=$( PORTS_LIST=$(
cat ${CONFIGDIR}/skim.conf ${CONFIGDIR}/ports.conf | \ cat ${CONFIGDIR}/skim.conf ${CONFIGDIR}/ports.conf | \

2
build/dvd.sh
View File

@ -29,7 +29,7 @@ set -e
SELF=dvd SELF=dvd
. ./common.sh && $(${SCRUB_ARGS}) . ./common.sh
check_images ${SELF} ${@} check_images ${SELF} ${@}

4
build/info.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# Copyright (c) 2016 Franco Fichtner <franco@opnsense.org> # Copyright (c) 2016-2017 Franco Fichtner <franco@opnsense.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions # modification, are permitted provided that the following conditions
@ -29,7 +29,7 @@ set -e
SELF=info SELF=info
. ./common.sh && $(${SCRUB_ARGS}) . ./common.sh
TAGNAME= TAGNAME=
if [ -n "${1}" ]; then if [ -n "${1}" ]; then

2
build/kernel.sh
View File

@ -29,7 +29,7 @@ set -e
SELF=kernel SELF=kernel
. ./common.sh && $(${SCRUB_ARGS}) . ./common.sh
KERNEL_SET=$(find ${SETSDIR} -name "kernel-*-${PRODUCT_ARCH}.txz") KERNEL_SET=$(find ${SETSDIR} -name "kernel-*-${PRODUCT_ARCH}.txz")

4
build/nano.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# Copyright (c) 2015-2016 Franco Fichtner <franco@opnsense.org> # Copyright (c) 2015-2017 Franco Fichtner <franco@opnsense.org>
# Copyright (c) 2004-2009 Scott Ullrich <sullrich@gmail.com> # Copyright (c) 2004-2009 Scott Ullrich <sullrich@gmail.com>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@ -30,7 +30,7 @@ set -e
SELF=nano SELF=nano
. ./common.sh && $(${SCRUB_ARGS}) . ./common.sh
check_images ${SELF} ${@} check_images ${SELF} ${@}

2
build/plugins.sh
View File

@ -29,7 +29,7 @@ set -e
SELF=plugins SELF=plugins
. ./common.sh && $(${SCRUB_ARGS}) . ./common.sh
PLUGINS_LIST=$( PLUGINS_LIST=$(
cat ${CONFIGDIR}/plugins.conf | while read PLUGIN_ORIGIN PLUGIN_IGNORE; do cat ${CONFIGDIR}/plugins.conf | while read PLUGIN_ORIGIN PLUGIN_IGNORE; do

2
build/ports.sh
View File

@ -29,7 +29,7 @@ set -e
SELF=ports SELF=ports
. ./common.sh && $(${SCRUB_ARGS}) . ./common.sh
PORTS_LIST=$( PORTS_LIST=$(
cat ${CONFIGDIR}/ports.conf | while read PORT_ORIGIN PORT_IGNORE; do cat ${CONFIGDIR}/ports.conf | while read PORT_ORIGIN PORT_IGNORE; do

2
build/prefetch.sh
View File

@ -29,7 +29,7 @@ set -e
SELF=prefetch SELF=prefetch
. ./common.sh && $(${SCRUB_ARGS}) . ./common.sh
# XXX does not adapt to FreeBSD version used # XXX does not adapt to FreeBSD version used
ABI="FreeBSD:11:${PRODUCT_ARCH}/${PRODUCT_SETTINGS}" ABI="FreeBSD:11:${PRODUCT_ARCH}/${PRODUCT_SETTINGS}"

4
build/print.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# Copyright (c) 2016 Franco Fichtner <franco@opnsense.org> # Copyright (c) 2016-2017 Franco Fichtner <franco@opnsense.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions # modification, are permitted provided that the following conditions
@ -29,7 +29,7 @@ set -e
SELF=print SELF=print
. ./common.sh && $(${SCRUB_ARGS}) . ./common.sh
for ARG in ${@}; do for ARG in ${@}; do
echo ${ARG}=\"$(printenv ${ARG})\" echo ${ARG}=\"$(printenv ${ARG})\"

4
build/rebase.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# Copyright (c) 2015 Franco Fichtner <franco@opnsense.org> # Copyright (c) 2015-2017 Franco Fichtner <franco@opnsense.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions # modification, are permitted provided that the following conditions
@ -29,7 +29,7 @@ set -e
SELF=rebase SELF=rebase
. ./common.sh && $(${SCRUB_ARGS}) . ./common.sh
BASE_OBSOLETE=$(find ${SETSDIR} -name "base-*-${PRODUCT_ARCH}.obsolete") BASE_OBSOLETE=$(find ${SETSDIR} -name "base-*-${PRODUCT_ARCH}.obsolete")
BASE_SET=$(find ${SETSDIR} -name "base-*-${PRODUCT_ARCH}.txz") BASE_SET=$(find ${SETSDIR} -name "base-*-${PRODUCT_ARCH}.txz")

4
build/release.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# Copyright (c) 2015-2016 Franco Fichtner <franco@opnsense.org> # Copyright (c) 2015-2017 Franco Fichtner <franco@opnsense.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions # modification, are permitted provided that the following conditions
@ -29,7 +29,7 @@ set -e
SELF=release SELF=release
. ./common.sh && $(${SCRUB_ARGS}) . ./common.sh
RELEASE_SET="${SETSDIR}/release-${PRODUCT_VERSION}-${PRODUCT_FLAVOUR}-${PRODUCT_ARCH}.tar" RELEASE_SET="${SETSDIR}/release-${PRODUCT_VERSION}-${PRODUCT_FLAVOUR}-${PRODUCT_ARCH}.tar"

2
build/rename.sh
View File

@ -29,7 +29,7 @@ set -e
SELF=rename SELF=rename
. ./common.sh && $(${SCRUB_ARGS}) . ./common.sh
for ARG in ${@}; do for ARG in ${@}; do
case ${ARG} in case ${ARG} in

4
build/serial.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# Copyright (c) 2014-2016 Franco Fichtner <franco@opnsense.org> # Copyright (c) 2014-2017 Franco Fichtner <franco@opnsense.org>
# Copyright (c) 2010-2011 Scott Ullrich <sullrich@gmail.com> # Copyright (c) 2010-2011 Scott Ullrich <sullrich@gmail.com>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@ -30,7 +30,7 @@ set -e
SELF=serial SELF=serial
. ./common.sh && $(${SCRUB_ARGS}) . ./common.sh
check_images ${SELF} ${@} check_images ${SELF} ${@}

4
build/sign.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# Copyright (c) 2016 Franco Fichtner <franco@opnsense.org> # Copyright (c) 2016-2017 Franco Fichtner <franco@opnsense.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions # modification, are permitted provided that the following conditions
@ -29,7 +29,7 @@ set -e
SELF=sign SELF=sign
. ./common.sh && $(${SCRUB_ARGS}) . ./common.sh
BASE_SET=$(find ${SETSDIR} -name "base-*-${PRODUCT_ARCH}.txz") BASE_SET=$(find ${SETSDIR} -name "base-*-${PRODUCT_ARCH}.txz")
if [ -f "${BASE_SET}" ]; then if [ -f "${BASE_SET}" ]; then

2
build/skim.sh
View File

@ -29,7 +29,7 @@ set -e
SELF=skim SELF=skim
. ./common.sh && $(${SCRUB_ARGS}) . ./common.sh
setup_stage ${STAGEDIR} setup_stage ${STAGEDIR}

2
build/test.sh
View File

@ -29,7 +29,7 @@ set -e
SELF=test SELF=test
. ./common.sh && $(${SCRUB_ARGS}) . ./common.sh
git_branch ${COREDIR} ${COREBRANCH} COREBRANCH git_branch ${COREDIR} ${COREBRANCH} COREBRANCH
git_branch ${PLUGINSDIR} ${PLUGINSBRANCH} PLUGINSBRANCH git_branch ${PLUGINSDIR} ${PLUGINSBRANCH} PLUGINSBRANCH

2
build/update.sh
View File

@ -29,7 +29,7 @@ set -e
SELF=update SELF=update
. ./common.sh && $(${SCRUB_ARGS}) . ./common.sh
for ARG in ${@}; do for ARG in ${@}; do
case ${ARG} in case ${ARG} in

2
build/verify.sh
View File

@ -29,7 +29,7 @@ set -e
SELF=verify SELF=verify
. ./common.sh && $(${SCRUB_ARGS}) . ./common.sh
setup_stage ${STAGEDIR} setup_stage ${STAGEDIR}
setup_base ${STAGEDIR} setup_base ${STAGEDIR}

4
build/vga.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# Copyright (c) 2014-2016 Franco Fichtner <franco@opnsense.org> # Copyright (c) 2014-2017 Franco Fichtner <franco@opnsense.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions # modification, are permitted provided that the following conditions
@ -29,7 +29,7 @@ set -e
SELF=vga SELF=vga
. ./common.sh && $(${SCRUB_ARGS}) . ./common.sh
check_images ${SELF} ${@} check_images ${SELF} ${@}

4
build/vm.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# Copyright (c) 2016 Franco Fichtner <franco@opnsense.org> # Copyright (c) 2016-2017 Franco Fichtner <franco@opnsense.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions # modification, are permitted provided that the following conditions
@ -29,7 +29,7 @@ set -e
SELF=vm SELF=vm
. ./common.sh && $(${SCRUB_ARGS}) . ./common.sh
check_images ${SELF} ${@} check_images ${SELF} ${@}

2
build/xtools.sh
View File

@ -29,7 +29,7 @@ set -e
SELF=xtools SELF=xtools
. ./common.sh && $(${SCRUB_ARGS}) . ./common.sh
if [ ${PRODUCT_HOST} = ${PRODUCT_ARCH} ]; then if [ ${PRODUCT_HOST} = ${PRODUCT_ARCH} ]; then
echo ">>> No need to build xtools on native build" echo ">>> No need to build xtools on native build"