diff options
author | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2008-11-17 13:15:48 +0000 |
---|---|---|
committer | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2008-11-17 13:15:48 +0000 |
commit | 61482d23acb1049f758932c4c2c3ab3f654026af (patch) | |
tree | ee0588264047ed9e9c7a0068fd188ff03df39e7b | |
parent | aa9d7156bba1271355e48293dee4ee2a6741ae9d (diff) | |
download | simplepkg-61482d23acb1049f758932c4c2c3ab3f654026af.tar.gz simplepkg-61482d23acb1049f758932c4c2c3ab3f654026af.tar.bz2 |
generic.mkSlackBuild: added git_source section
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@528 04377dda-e619-0410-9926-eae83683ac58
-rw-r--r-- | trunk/doc/CHANGELOG | 3 | ||||
-rw-r--r-- | trunk/mkbuild/generic.mkSlackBuild | 22 | ||||
-rw-r--r-- | trunk/mkbuild/model.mkbuild | 1 |
3 files changed, 25 insertions, 1 deletions
diff --git a/trunk/doc/CHANGELOG b/trunk/doc/CHANGELOG index 3af2998..180dbb3 100644 --- a/trunk/doc/CHANGELOG +++ b/trunk/doc/CHANGELOG @@ -5,8 +5,9 @@ simplepkg changelog ======== - generic.mkSlackBuild: - - config() on postinstall_script now accepting .dist and .sample config file extensions. + - config() on postinstall_script now accepting .dist and .sample config file extensions - clean_builds now compliant with standard --cleanup behaviour + - added git_source section - createpkg: most clean -s option output - lspkg: fix on package search routine - jail-commit: using unified diff diff --git a/trunk/mkbuild/generic.mkSlackBuild b/trunk/mkbuild/generic.mkSlackBuild index 49b9e71..2f1bf99 100644 --- a/trunk/mkbuild/generic.mkSlackBuild +++ b/trunk/mkbuild/generic.mkSlackBuild @@ -137,6 +137,28 @@ PKG_SRC="$PWD/$SND_DIR" cd "$PKG_SRC" </svn_source> +<git_source> off +# Get git source code +cd "$SRC_DIR" +SND_DIR="`basename [[DOWNLOAD FOLDER URL]] .git`" + +if [ "`find "$SRC_DIR/" -name .git`" != "" ] && [ -d "$SRC_DIR/$SND_DIR" ]; then + cd $SND_DIR + git pull || exit $ERROR_VCS +else + git clone [[DOWNLOAD FOLDER URL]] $SND_DIR || exit $ERROR_VCS + cd $SND_DIR +fi + +PKG_VERSION="`git log | head -n 1 | awk '{ print $2 }'`_git" + +# Copy git source +cd "$PKG_WORK" +cp -a $SRC_DIR/* . +PKG_SRC="$PWD/$SND_DIR" +cd "$PKG_SRC" +</git_source> + <md5sum_check> off MD5SUM_URL="[[MD5SUM CODE]]" diff --git a/trunk/mkbuild/model.mkbuild b/trunk/mkbuild/model.mkbuild index 391b750..86f0c2d 100644 --- a/trunk/mkbuild/model.mkbuild +++ b/trunk/mkbuild/model.mkbuild @@ -130,6 +130,7 @@ off: create_build_user_and_group on: download_source off: svn_source +off: git_source off: md5sum_download_and_check_0 off: md5sum_download_and_check_1 off: gpg_signature_check |