update buildsystem
This commit is contained in:
@@ -275,12 +275,12 @@ case "$mode" in
|
|||||||
PREVENT='libpam-systemd policykit.* colord dconf-service'
|
PREVENT='libpam-systemd policykit.* colord dconf-service'
|
||||||
docker exec ${DOCKER_ID} apt-get update ${OPTIONS}
|
docker exec ${DOCKER_ID} apt-get update ${OPTIONS}
|
||||||
docker exec ${DOCKER_ID} apt-mark hold ${PREVENT}
|
docker exec ${DOCKER_ID} apt-mark hold ${PREVENT}
|
||||||
docker exec ${DOCKER_ID} apt-get upgrade ${OPTIONS}
|
#docker exec ${DOCKER_ID} apt-get upgrade ${OPTIONS}
|
||||||
docker exec ${DOCKER_ID} apt-get install ${OPTIONS} ${PREVENT// /- }- python-software-properties software-properties-common apt-transport-https dpkg-dev lsb-release wget || \
|
docker exec ${DOCKER_ID} apt-get install ${OPTIONS} ${PREVENT// /- }- python-software-properties software-properties-common apt-transport-https dpkg-dev lsb-release wget || \
|
||||||
docker exec ${DOCKER_ID} apt-get install ${OPTIONS} ${PREVENT// /- }- software-properties-common apt-transport-https dpkg-dev lsb-release wget || \
|
docker exec ${DOCKER_ID} apt-get install ${OPTIONS} ${PREVENT// /- }- software-properties-common apt-transport-https dpkg-dev lsb-release wget || \
|
||||||
docker exec ${DOCKER_ID} apt-get install ${OPTIONS} ${PREVENT// /- }- python-software-properties apt-transport-https dpkg-dev lsb-release wget;
|
docker exec ${DOCKER_ID} apt-get install ${OPTIONS} ${PREVENT// /- }- python-software-properties apt-transport-https dpkg-dev lsb-release wget;
|
||||||
if [[ "${img}" =~ "ubuntu" ]]; then
|
if [[ "${img}" =~ "ubuntu" ]]; then
|
||||||
docker exec ${DOCKER_ID} apt-get install ${OPTIONS} ${PREVENT} locales
|
docker exec ${DOCKER_ID} apt-get install ${OPTIONS} ${PREVENT// /- }- locales
|
||||||
docker exec ${DOCKER_ID} locale-gen ${LANG}
|
docker exec ${DOCKER_ID} locale-gen ${LANG}
|
||||||
docker exec ${DOCKER_ID} update-locale LANG=${LANG}
|
docker exec ${DOCKER_ID} update-locale LANG=${LANG}
|
||||||
fi
|
fi
|
||||||
@@ -290,7 +290,7 @@ case "$mode" in
|
|||||||
docker exec ${DOCKER_ID} bash -c "echo >> /etc/apt/preferences"
|
docker exec ${DOCKER_ID} bash -c "echo >> /etc/apt/preferences"
|
||||||
done
|
done
|
||||||
if test -n "${keys[@]}"; then # fix dependency bug in cosmic and stretch
|
if test -n "${keys[@]}"; then # fix dependency bug in cosmic and stretch
|
||||||
docker exec ${DOCKER_ID} apt-get install ${OPTIONS} ${PREVENT} gnupg
|
docker exec ${DOCKER_ID} apt-get install ${OPTIONS} ${PREVENT// /- }- gnupg
|
||||||
for key in "${keys[@]}"; do
|
for key in "${keys[@]}"; do
|
||||||
wget -O- "$key" \
|
wget -O- "$key" \
|
||||||
| docker exec -i ${DOCKER_ID} apt-key add -
|
| docker exec -i ${DOCKER_ID} apt-key add -
|
||||||
@@ -302,7 +302,7 @@ case "$mode" in
|
|||||||
|
|
||||||
docker exec ${DOCKER_ID} apt-get update ${OPTIONS}
|
docker exec ${DOCKER_ID} apt-get update ${OPTIONS}
|
||||||
for package in "${packages[@]}"; do
|
for package in "${packages[@]}"; do
|
||||||
ifthenelse "${package}" "apt-get install ${OPTIONS} ${PREVENT} ARG"
|
ifthenelse "${package}" "apt-get install ${OPTIONS} ${PREVENT// /- }- ARG"
|
||||||
done
|
done
|
||||||
for command in "${commands[@]}"; do
|
for command in "${commands[@]}"; do
|
||||||
ifthenelse "${command}" "ARG"
|
ifthenelse "${command}" "ARG"
|
||||||
@@ -363,7 +363,7 @@ docker exec -u $(id -u):$(id -g) ${DOCKER_ID} ./bootstrap.sh -t "${targets}" ${h
|
|||||||
# not supported in trusty and jessie
|
# not supported in trusty and jessie
|
||||||
if test "$mode" = deb -a "${img//trusty/}" = "${img}" -a "${img//jessie/}" = "${img}"; then
|
if test "$mode" = deb -a "${img//trusty/}" = "${img}" -a "${img//jessie/}" = "${img}"; then
|
||||||
if test "${targets//deb/}" != "${targets}" && ls *.deb > /dev/null 2> /dev/null; then
|
if test "${targets//deb/}" != "${targets}" && ls *.deb > /dev/null 2> /dev/null; then
|
||||||
docker exec ${DOCKER_ID} bash -c "apt-get install ${OPTIONS} ${PREVENT} /workdir/*.deb"
|
docker exec ${DOCKER_ID} bash -c "apt-get install ${OPTIONS} ${PREVENT// /- }- /workdir/*.deb"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
if test "$mode" = rpm -a "${targets//rpm/}" != "${targets}"; then
|
if test "$mode" = rpm -a "${targets//rpm/}" != "${targets}"; then
|
||||||
|
@@ -59,7 +59,7 @@ while [ $found -ne 0 ]; do
|
|||||||
cd "${target}"
|
cd "${target}"
|
||||||
for file in $(find . -type f); do
|
for file in $(find . -type f); do
|
||||||
for lib in $(otool -L ${file} | tail -n +2 \
|
for lib in $(otool -L ${file} | tail -n +2 \
|
||||||
| egrep '/usr/local/|/opt/local/|'"${HOME}" \
|
| egrep '/usr/local/|/opt/local/|/opt/X11/|'"${HOME}" \
|
||||||
| grep -v $file | awk '{print $1}'); do
|
| grep -v $file | awk '{print $1}'); do
|
||||||
found=1
|
found=1
|
||||||
test -f ${lib##*/} \
|
test -f ${lib##*/} \
|
||||||
|
@@ -97,12 +97,12 @@ fi
|
|||||||
|
|
||||||
if test -n "${SCHROOTNAME}"; then
|
if test -n "${SCHROOTNAME}"; then
|
||||||
FILES=$(LANG= schroot -c ${SCHROOTNAME} -- rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p')
|
FILES=$(LANG= schroot -c ${SCHROOTNAME} -- rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p')
|
||||||
if test -n "${FILES}${DEPS}"; then
|
if test -n "${FILES// /}${DEPS// /}"; then
|
||||||
schroot -c ${SCHROOTNAME} -u root -- ${INSTALL_TOOL} ${FILES} ${DEPS}
|
schroot -c ${SCHROOTNAME} -u root -- ${INSTALL_TOOL} ${FILES} ${DEPS}
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
FILES=$(LANG= rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p')
|
FILES=$(LANG= rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p')
|
||||||
if test -n "${FILES}${DEPS}"; then
|
if test -n "${FILES// /}${DEPS// /}"; then
|
||||||
${INSTALL_TOOL} ${FILES} ${DEPS}
|
${INSTALL_TOOL} ${FILES} ${DEPS}
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
@@ -112,7 +112,7 @@ if test -n "${SCHROOTNAME}"; then
|
|||||||
else
|
else
|
||||||
FILES=$(LANG= rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p')
|
FILES=$(LANG= rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p')
|
||||||
fi
|
fi
|
||||||
if test -n "${FILES}"; then
|
if test -n "${FILES// /}"; then
|
||||||
echo "**** ERROR: Cannot install: " $FILES
|
echo "**** ERROR: Cannot install: " $FILES
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
Reference in New Issue
Block a user