From 9b9e3b19cdccf5e442c129d4814da7987afb16a7 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Fri, 9 Jul 2021 14:14:34 +0200 Subject: Use autoclone where possible --- core/modules/cron/module.build | 9 ++------- core/modules/cron/module.conf | 3 +-- 2 files changed, 3 insertions(+), 9 deletions(-) (limited to 'core/modules/cron') diff --git a/core/modules/cron/module.build b/core/modules/cron/module.build index d4ecce79..66cc8ecc 100644 --- a/core/modules/cron/module.build +++ b/core/modules/cron/module.build @@ -1,16 +1,11 @@ #!/bin/bash fetch_source() { - [ -d "${MODULE_WORK_DIR}/src/.git" ] && return 0 - rm -rf -- "${MODULE_WORK_DIR}/src" - git clone "${REQUIRED_GIT}" "${MODULE_WORK_DIR}/src" || perror "Could not clone git to ${MODULE_WORK_DIR}/src" - cd "${MODULE_WORK_DIR}/src" - git checkout "${REQUIRED_COMMIT}" || perror "Could not switch to required commit" - cd - &>/dev/null + autoclone } build() { # compilation - cde "${MODULE_WORK_DIR}/src" + cde "${MODULE_WORK_DIR}/src/cronie" ./autogen.sh || perror "Autogen failed" ./configure --disable-dependency-tracking --enable-syscrontab --prefix= --exec-prefix= --bindir=/opt/openslx/bin --sbindir=/opt/openslx/sbin || perror "configure failed" diff --git a/core/modules/cron/module.conf b/core/modules/cron/module.conf index 0a9c52c3..dad74838 100644 --- a/core/modules/cron/module.conf +++ b/core/modules/cron/module.conf @@ -2,8 +2,7 @@ REQUIRED_MODULES=" slxlog " -REQUIRED_GIT="https://github.com/cronie-crond/cronie.git" -REQUIRED_COMMIT="d582556168e740fbd19e777a6733b404084e69d8" +REQUIRED_GIT="https://github.com/cronie-crond/cronie.git||d582556168e740fbd19e777a6733b404084e69d8" REQUIRED_BINARIES=" crond " -- cgit v1.2.3-55-g7522