Skip to content

Commit f69964f

Browse files
committed
detect-environment: Removed RPMBUILD_CMD environment variable
AIX 5.3 is no longer supported, so we don't need this environment variable anymore. Ticket: ENT-12600 Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
1 parent a503829 commit f69964f

File tree

3 files changed

+2
-9
lines changed

3 files changed

+2
-9
lines changed

build-scripts/detect-environment

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -344,13 +344,6 @@ detect_tools()
344344
fatal "GNU Make not found"
345345
fi
346346

347-
if [ "$OS" = "aix" ] && [ "$OS_VERSION" = "5.3" ]; then
348-
RPMBUILD_CMD=rpm
349-
else
350-
RPMBUILD_CMD=rpmbuild
351-
fi
352-
export RPMBUILD_CMD
353-
354347
FUSER=$(func_whereis fuser)
355348
export FUSER
356349

build-scripts/package

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ case "$PACKAGING" in
178178
# - argv[2] = a b
179179
# Also note that $RPMBUILD_OPTIONS might have spaces
180180
# which must be preserved
181-
eval "$RPMBUILD_CMD" -bb \
181+
eval rpmbuild -bb \
182182
--define "'_topdir $BASEDIR/$PKG'" \
183183
--define "'buildprefix $BUILDPREFIX'" \
184184
--define "'_basedir $BASEDIR'" \

deps-packaging/pkg-build-rpm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ fi
112112
# example cmd --define 'a b':
113113
# - argv[1] = --define
114114
# - argv[2] = a b
115-
eval $RPMBUILD_CMD -bb \
115+
eval rpmbuild -bb \
116116
--define "'_topdir $BASEDIR/$PKGNAME'" \
117117
--define "'version $VERSION'" \
118118
--define "'buildprefix $BUILDPREFIX'" \

0 commit comments

Comments
 (0)