workaround for importing some SUSE vars...
This commit is contained in:
parent
164032088a
commit
59bec45449
@ -85,7 +85,7 @@ CHROOTDIR_GLOB="${CHROOTDIR}"
|
|||||||
BUILDDIR_GLOB="${BUILDDIR}"
|
BUILDDIR_GLOB="${BUILDDIR}"
|
||||||
|
|
||||||
# Set the version.
|
# Set the version.
|
||||||
VERSION="$(git describe --abbrev=0 --tags)-$(git rev-parse --short --verify HEAD)"
|
BUILDVERSION="$(git describe --abbrev=0 --tags)-$(git rev-parse --short --verify HEAD)"
|
||||||
BUILD="$(cat BUILDNO)"
|
BUILD="$(cat BUILDNO)"
|
||||||
BUILD="$(expr ${BUILD} + 1)"
|
BUILD="$(expr ${BUILD} + 1)"
|
||||||
echo ${BUILD} > ./BUILDNO
|
echo ${BUILD} > ./BUILDNO
|
||||||
@ -104,7 +104,7 @@ set -e
|
|||||||
USERNAME_REAL="$(grep ${BUILD_USERNAME} /etc/passwd | cut -f5 -d':')"
|
USERNAME_REAL="$(grep ${BUILD_USERNAME} /etc/passwd | cut -f5 -d':')"
|
||||||
|
|
||||||
cat > ${BASEDIR}/VERSION_INFO.txt << EOF
|
cat > ${BASEDIR}/VERSION_INFO.txt << EOF
|
||||||
Version: ${VERSION}
|
Version: ${BUILDVERSION}
|
||||||
Build: ${BUILD}
|
Build: ${BUILD}
|
||||||
Time: ${BUILDTIME}
|
Time: ${BUILDTIME}
|
||||||
Machine: ${BUILD_MACHINE}
|
Machine: ${BUILD_MACHINE}
|
||||||
|
@ -37,7 +37,10 @@ function centos_is_stupid {
|
|||||||
XORRISO_RPM=$(curl -s "http://software.opensuse.org/download.html?project=home%3AKnolleblau&package=xorriso" | egrep "/openSUSE_${SUSE_VER}/x86_64/xorriso-[0-9.-]" | tail -n1 | sed -re 's|^.*x86_64/(xorriso-[0-9.-]*.x86_64.rpm).*$|\1|g')
|
XORRISO_RPM=$(curl -s "http://software.opensuse.org/download.html?project=home%3AKnolleblau&package=xorriso" | egrep "/openSUSE_${SUSE_VER}/x86_64/xorriso-[0-9.-]" | tail -n1 | sed -re 's|^.*x86_64/(xorriso-[0-9.-]*.x86_64.rpm).*$|\1|g')
|
||||||
echo "Since you're using openSUSE or SLED/SLES, we need to install xorriso directly from an RPM. Please wait while we do this..."
|
echo "Since you're using openSUSE or SLED/SLES, we need to install xorriso directly from an RPM. Please wait while we do this..."
|
||||||
curl -sLo /tmp/${XORRISO_RPM} "http://download.opensuse.org/repositories/home:/Knolleblau/openSUSE_${SUSE_VER}/x86_64/${XORRISO_RPM}"
|
curl -sLo /tmp/${XORRISO_RPM} "http://download.opensuse.org/repositories/home:/Knolleblau/openSUSE_${SUSE_VER}/x86_64/${XORRISO_RPM}"
|
||||||
|
cp /etc/zypp/zypp.conf /etc/zypp/zypp.conf_BAK."${$}"
|
||||||
|
echo 'pkg_gpgcheck = no' >> /etc/zypp/zypp.conf
|
||||||
zypper install --no-confirm -l /tmp/${XORRISO_RPM} >> "${LOGFILE}.${FUNCNAME}" 2>&1
|
zypper install --no-confirm -l /tmp/${XORRISO_RPM} >> "${LOGFILE}.${FUNCNAME}" 2>&1
|
||||||
|
mv -f /etc/zypp/zypp.conf_BAK."${$}" /etc/zypp/zypp.conf
|
||||||
echo "Done."
|
echo "Done."
|
||||||
|
|
||||||
echo
|
echo
|
||||||
|
@ -5,15 +5,15 @@ function yo_dj () {
|
|||||||
ARCH="${1}"
|
ARCH="${1}"
|
||||||
echo "Building the actual .iso image. This may take a while."
|
echo "Building the actual .iso image. This may take a while."
|
||||||
#im_batman ## WHYTF IS THIS HERE?!
|
#im_batman ## WHYTF IS THIS HERE?!
|
||||||
ISOFILENAME="${UXNAME}-${VERSION}.iso"
|
ISOFILENAME="${UXNAME}-${BUILDVERSION}.iso"
|
||||||
#MINIFILENAME="${UXNAME}-${VERSION}-mini.iso"
|
#MINIFILENAME="${UXNAME}-${BUILDVERSION}-mini.iso"
|
||||||
MINIFILENAME="${UXNAME}-mini.iso"
|
MINIFILENAME="${UXNAME}-mini.iso"
|
||||||
USBFILENAME="${UXNAME}-mini.usb.img"
|
USBFILENAME="${UXNAME}-mini.usb.img"
|
||||||
if [[ "${MULTIARCH}" == "y" ]];
|
if [[ "${MULTIARCH}" == "y" ]];
|
||||||
then
|
then
|
||||||
ISOFILENAME="${UXNAME}-${VERSION}-any.iso"
|
ISOFILENAME="${UXNAME}-${BUILDVERSION}-any.iso"
|
||||||
else
|
else
|
||||||
ISOFILENAME="${UXNAME}-${VERSION}-${ARCH}.iso"
|
ISOFILENAME="${UXNAME}-${BUILDVERSION}-${ARCH}.iso"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "${I_AM_A_RACECAR}" == "y" ]];
|
if [[ "${I_AM_A_RACECAR}" == "y" ]];
|
||||||
|
@ -1,5 +1,8 @@
|
|||||||
binutils
|
binutils
|
||||||
|
binutils-devel
|
||||||
|
binutils-devel-32bit
|
||||||
curl
|
curl
|
||||||
|
dosfstools
|
||||||
gcc
|
gcc
|
||||||
gcc-32bit
|
gcc-32bit
|
||||||
git
|
git
|
||||||
@ -15,3 +18,5 @@ sed
|
|||||||
squashfs
|
squashfs
|
||||||
syslinux
|
syslinux
|
||||||
xz
|
xz
|
||||||
|
xz-devel
|
||||||
|
xz-devel-32bit
|
||||||
|
Loading…
Reference in New Issue
Block a user