X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=builder;h=479a0c27d25459111bd3acb959e6f03d52f3158b;hb=c8ede00ed537bae98a6513c11d37386dc4ce114d;hp=189d18a4529d915996b53e3e7ad458e0779f5522;hpb=497984afa27d22fc0ab42f6e77a1aec4b681c9d1;p=packages%2Frpm-build-tools.git diff --git a/builder b/builder index 189d18a..479a0c2 100755 --- a/builder +++ b/builder @@ -119,7 +119,7 @@ NEW_REPO="" RES_FILE="" -DISTFILES_SERVER="://distfiles.pld-linux.org" +DISTFILES_SERVER="://df.tld-linux.org" ATTICDISTFILES_SERVER="://attic-distfiles.pld-linux.org" DEF_NICE_LEVEL=19 @@ -815,7 +815,6 @@ get_spec() { Exit_error err_not_implemented else ( - cd "$REPO_DIR" unset GIT_WORK_TREE git clone -o $REMOTE_PLD ${GIT_SERVER}:${PACKAGES_DIR}/${ASSUMED_NAME}.git "$REPO_DIR/${ASSUMED_NAME}" || { # softfail if new package, i.e not yet added to PLD rep @@ -1486,6 +1485,7 @@ build_package() { fi fi else + BRLISTFILE=$(tempfile) eval ${NICE_COMMAND} $RPMBUILD $TARGET_SWITCH $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $RPMBUILDOPTS $BCOND --define \'_specdir $PACKAGE_DIR\' --define \'_sourcedir $PACKAGE_DIR\' $SPECFILE RETVAL=$? fi @@ -1498,6 +1498,17 @@ build_package() { fi echo "" fi + # try to nicely show package list, to just copy&paste it to poldek or so... + eval ${NICE_COMMAND} $RPMBUILD $TARGET_SWITCH $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $RPMBUILDOPTS $BCOND --define \'_specdir $PACKAGE_DIR\' --define \'_sourcedir $PACKAGE_DIR\' $SPECFILE 2>$BRLISTFILE + BRLIST=$(awk 'BEGIN{ORS=" ";} NR>1 {print $1;}' $BRLISTFILE) + echo + echo "To install packages type:" + echo "poldek -ivh $BRLIST" + echo + echo "In poldek, copy these command:" + echo "install $BRLIST" + echo + rm $BRLISTFILE Exit_error err_build_fail fi unset BUILD_SWITCH