添付ファイル | mkkpkg.diff [^] (1,644 バイト) 2010-02-11 06:55 [表示] [非表示]--- mkkpkg.orig 2010-02-11 05:06:41.000000000 +0900
+++ mkkpkg 2010-02-11 05:27:31.000000000 +0900
@@ -346,7 +346,7 @@
echo "$CMDNAME: failed to query $SPEC"
exit 1
fi
- rpm -bs $SPEC >/dev/null 2>&1
+ rpmbuild -bs $SPEC >/dev/null 2>&1
if [ $? -ne 0 ] ; then
echo "$CMDNAME: failed to build $SPEC"
exit 1
@@ -453,7 +453,7 @@
$QUIET "`LANG=C date '+%c'`"
$QUIET -n "$CMDNAME: rebuilding `basename $SRPM` for $ARCH..."
KSTARTTIME=`LANG=C date '+%s'`
- eval LANG=C $NICE rpm --rebuild $SRPM --target $ARCH $RPMARG \
+ eval LANG=C $NICE rpmbuild --rebuild $SRPM --target $ARCH $RPMARG \
>$TMPDIR/$LOGFILE 2>&1
RETVAL=$?
$QUIET "exit $RETVAL"
@@ -592,7 +592,7 @@
# first, we clean up existing BUILDLINUXDIR (if any) by executing -bs
mkdir -p $SRPMDIR/.${CMDNAME}.tmp
-rpm -bs --clean $SPEC --define "_srcrpmdir $SRPMDIR/.${CMDNAME}.tmp" >/dev/null 2>&1
+rpmbuild -bs --clean $SPEC --define "_srcrpmdir $SRPMDIR/.${CMDNAME}.tmp" >/dev/null 2>&1
rm -rf $SRPMDIR/.${CMDNAME}.tmp
TMPPRE=`mktemp $TMPDIR/$CMDNAME.XXXXXX` || \
{ echo "could not create temporary file" ; exit 1 ; }
@@ -600,7 +600,7 @@
# then, we expand
$QUIET -n "Executing \"rpmbuild -bp $SPEC\"..."
-if ! rpm -bp $SPEC >/dev/null 2>&1 ; then
+if ! rpmbuild -bp $SPEC >/dev/null 2>&1 ; then
echo "" && echo "Failed to expand sources/patches."
rm -f $TMPPRE && exit -1
else
@@ -989,7 +989,7 @@
[ $? = 1 ] && CLEAN=1
if [ "$CLEAN" = "1" ] ;then
- rpm --rmsource --rmspec --clean --force $NSPEC >/dev/null 2>&1
+ rpmbuild --rmsource --rmspec --clean --force $NSPEC >/dev/null 2>&1
rm -f $SPEC
rm -f $SRCDIR/*.config.mkkpkg
fi
|