From 2994bca96781afd62104c1515532a9c479cb5bed Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Sat, 10 Aug 2024 22:28:34 +0200 Subject: Revert "some temporary patching for [staging] and [testing] repos" This reverts commit d3d19c4fbb0fc632624d3625d5db322500a1fe8b. [staging] and [testing] are empty now --- Makefile | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 91db463..dd49ce1 100644 --- a/Makefile +++ b/Makefile @@ -189,10 +189,7 @@ $(BUILDDIR)/pacman.conf.d/%-i486.conf: config/pacman/%.conf @sed " \ s,/mirrorlist\$$,\032,; \ /^Architecture = / s/^.*\$$/Architecture = i486/; \ - " "$<" > /tmp/$$.tmp - @sed -i '/^\[core-staging\]/ i \[staging\]\nInclude = \/etc\/pacman.d\/mirrorlist32\n' /tmp/$$.tmp - @sed -i '/^\[core-testing\]/ i \[testing\]\nInclude = \/etc\/pacman.d\/mirrorlist32\n' /tmp/$$.tmp - @cat /tmp/$$.tmp > "$@" + " "$<" > "$@" $(BUILDDIR)/pacman.conf.d/%-i686.conf: config/pacman/%.conf @echo "GEN $(notdir $@)" @@ -200,10 +197,7 @@ $(BUILDDIR)/pacman.conf.d/%-i686.conf: config/pacman/%.conf @sed " \ s,/mirrorlist\$$,\032,; \ /^Architecture = / s/^.*$$/Architecture = i686/ \ - " "$<" > /tmp/$$.tmp - @sed -i '/^\[core-staging\]/ i \[staging\]\nInclude = \/etc\/pacman.d\/mirrorlist32\n' /tmp/$$.tmp - @sed -i '/^\[core-testing\]/ i \[testing\]\nInclude = \/etc\/pacman.d\/mirrorlist32\n' /tmp/$$.tmp - @cat /tmp/$$.tmp > "$@" + " "$<" > "$@" $(BUILDDIR)/pacman.conf.d/%-pentium4.conf: config/pacman/%.conf @echo "GEN $(notdir $@)" @@ -211,10 +205,7 @@ $(BUILDDIR)/pacman.conf.d/%-pentium4.conf: config/pacman/%.conf @sed " \ s,/mirrorlist\$$,\032,; \ /^Architecture = / s/^.*$$/Architecture = pentium4/ \ - " "$<" > /tmp/$$.tmp - @sed -i '/^\[core-staging\]/ i \[staging\]\nInclude = \/etc\/pacman.d\/mirrorlist32\n' /tmp/$$.tmp - @sed -i '/^\[core-testing\]/ i \[testing\]\nInclude = \/etc\/pacman.d\/mirrorlist32\n' /tmp/$$.tmp - @cat /tmp/$$.tmp > "$@" + " "$<" > "$@" define buildInScript $(1)/%: $(2)%$(3) -- cgit v1.2.3-70-g09d2