]> wolfpit.net Git - tool/wolfaur/.git/commitdiff
ignores faulty version checks (for now)
authorVincent Dahmen <wahrwolf@wolfpit.net>
Mon, 5 Apr 2021 17:12:04 +0000 (19:12 +0200)
committerVincent Dahmen <wahrwolf@wolfpit.net>
Mon, 5 Apr 2021 17:13:53 +0000 (19:13 +0200)
Makefile
build_package.sh
register_package.sh

index ac853752e793aae25ea934d20fd88103ad1787ec..9ebffca51e4b032a99c1262d2f2fdd16edad5c16 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -26,10 +26,10 @@ packages/%: build/%/$(VERSION_FILE)
 build/%: build/%/.git
 
 build/%/$(VERSION_FILE): build/%/PKGBUILD
-       /bin/touch $@
        /bin/bash -c "/srv/aur/build_package.sh $(dir $<)"
 
 build/%/PKGBUILD: build/%/.git
+       - git -C $(dir $@) checkout master --force
        - git -C $(dir $@) pull 
 
 build/%/.git:
index fd244d62f6d3180de4409d3328b20eb0415661e8..401514ed6883cadbc8e5fce33bf74485b583d920 100755 (executable)
@@ -19,6 +19,8 @@ else
                mkarchroot "$CHROOT_DIR/$target/root" base-devel
                export BUILD_ARGS="-r $CHROOT_DIR/$target $BUILD_ARGS"
        fi
-       (cd "$src_dir" && "$BUILD_SCRIPT" "$BUILD_ARGS" -- "$MAKECHROOTPKG_ARGS")
-       (cd "$src_dir" && makepkg --packagelist > "$VERSION_FILE")
+       (
+               cd "$src_dir" && "$BUILD_SCRIPT" "$BUILD_ARGS" -- "$MAKECHROOTPKG_ARGS" &&
+               makepkg --packagelist > "$VERSION_FILE"
+       )
 fi 
index 4dd4b543a4889cf81ffca826c78d1a65097c54d4..372a981d19800ded24f9c0f0abeddad9f7bff05c 100755 (executable)
@@ -11,12 +11,12 @@ then
        echo Found "$SKIP_TAG in $pkg_dir/$VERSION_FILE"
        echo Skipping "$pkg_dir"
        exit 0
-
-elif [[ $(< "$pkg_dir/$VERSION_FILE") != $(basename "$pkg_version") ]]
-then
-       echo "Target $pkg_dir may not build correctly! Skipping..."
-       exit 1
-
+#elif [[ $(< "$pkg_dir/$VERSION_FILE") != $(basename "$pkg_version") ]]
+#then
+#      echo "Target $pkg_dir may not build correctly! Skipping..."
+#      rm  "$pkg_dir/$VERSION_FILE"
+#      exit 0
+#
 elif [ -e "$pkg_path" ]
 then
        echo "Adding "  "$(basename "$pkg_version")" " to $DB_PATH"