|
14 | 14 | _append=""
|
15 | 15 | RCV=`command -v xbps-checkvers 2>/dev/null`
|
16 | 16 | RCV_F="repo-checkvers.txt"
|
| 17 | +RCV_FPV="repo-checkvers-pkgver.txt" |
17 | 18 | RCV_FR="repo-checkvers-remove.txt"
|
18 | 19 | TOBUILD=
|
19 | 20 | _TOBUILD=
|
@@ -125,7 +126,9 @@ case "$?" in
|
125 | 126 | 0) # version < 0.54
|
126 | 127 | grep pkgname "$RCV_F" | awk '{ print $2 }' >pkgs.txt ;;
|
127 | 128 | 1) # version >= 0.54
|
128 |
| - cut -d' ' -f1 "$RCV_F" >pkgs.txt ;; |
| 129 | + cut -d' ' -f1 "$RCV_F" >pkgs.txt |
| 130 | + cut -d' ' -f1-2 "$RCV_F" > "$RCV_FPV" |
| 131 | + ;; |
129 | 132 | *)
|
130 | 133 | echo "ERROR: couldn't determine xbps-checkvers version"
|
131 | 134 | exit 1
|
@@ -217,13 +220,19 @@ printf "BUILT = \$(patsubst tobuild/%%,built/%%,\$(TOBUILD))\n\n" >> Makefile
|
217 | 220 | printf "PKGS_REMOVED = $TOREMOVE\n" >> Makefile
|
218 | 221 | printf "TOREMOVE = \$(patsubst %%,toremove/%%,\$(PKGS_REMOVED))\n" >> Makefile
|
219 | 222 | printf "REMOVED = \$(patsubst toremove/%%,removed/%%,\$(TOREMOVE))\n\n" >> Makefile
|
220 |
| -printf "all: \$(BUILT) \$(REMOVED)\n" >> Makefile |
| 223 | +printf "all: allbuilt allremoved\n" >> Makefile |
221 | 224 | printf "\t@echo \"[Done]\"\n\n" >> Makefile
|
| 225 | +printf "allbuilt: \$(BUILT)\n\n" >> Makefile |
| 226 | +printf "allremoved: \$(REMOVED) remove_disabled\n\n" >> Makefile |
| 227 | +printf "remove_disabled: allbuilt\n" >> Makefile |
| 228 | +printf "\t@touch disabled.txt\n" >> Makefile |
| 229 | +printf "\t@./remove-disabled.sh \"$HOSTDIR/binpkgs\" $PKG_ARCH ${CROSS_ARCH:+XBPS_TARGET_ARCH=$CROSS_ARCH} \n" >> Makefile |
| 230 | +printf "\t@rm disabled.txt\n\n" >> Makefile |
222 | 231 | printf "print_pkgs:\n" >> Makefile
|
223 | 232 | printf "\t@echo \$(PKGS)\n\n" >> Makefile
|
224 | 233 | printf "built/%%: tobuild/%%\n" >> Makefile
|
225 | 234 | printf "\t@echo \"[xbps-src]\t\${@F}\"\n" >> Makefile
|
226 |
| -printf "\t@( $XSC pkg \${@F}; rval=\$\$?; [ \$\$rval -eq 2 ] && exit 0 || exit \$\$rval )\n" >> Makefile |
| 235 | +printf "\t@( $XSC pkg \${@F}; rval=\$\$?; [ \$\$rval -eq 2 ] && { echo \${@F} >> disabled.txt; exit 0; } || exit \$\$rval )\n" >> Makefile |
227 | 236 | printf "\t@touch \$@\n" >> Makefile
|
228 | 237 | printf "\t@rm tobuild/\${@F}\n\n" >> Makefile
|
229 | 238 | printf "removed/%%: toremove/%%\n" >> Makefile
|
@@ -267,7 +276,7 @@ printf "clean:\n" >> Makefile
|
267 | 276 | printf "\t@rm -f built/*\n" >> Makefile
|
268 | 277 | printf "\t@rm -f removed/*\n" >> Makefile
|
269 | 278 | printf "\t@echo \"[Clean]\"\n\n" >> Makefile
|
270 |
| -printf ".PHONY: all print_pkgs clean\n" >> Makefile |
| 279 | +printf ".PHONY: all print_pkgs clean allbuilt allremoved remove_disabled\n" >> Makefile |
271 | 280 |
|
272 | 281 | printf "INFO: 'Makefile' generated.\n"
|
273 | 282 | printf "INFO: Type 'make'\n"
|
|
0 commit comments