diff options
| -rw-r--r-- | system/ansible/ansible.SlackBuild | 42 | ||||
| -rw-r--r-- | system/ansible/ansible.info | 4 |
2 files changed, 17 insertions, 29 deletions
diff --git a/system/ansible/ansible.SlackBuild b/system/ansible/ansible.SlackBuild index e5bdb6272e1a..3d1027152778 100644 --- a/system/ansible/ansible.SlackBuild +++ b/system/ansible/ansible.SlackBuild @@ -41,17 +41,17 @@ PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi set -e @@ -60,26 +60,14 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION - -# Minor unpacking deviation from the SlackBuild template -# due to the source being downloaded from github -# -# wget/curl (no redirection) -> release$VERSION -# browser -> ansible-ansible-v{tag}-{n}-g{sha}.tar.gz -# -- refer to https://github.com/blog/651-annotated-downloads -SOURCEFILE=$(find "$CWD" -type f \( -name "release$VERSION" -o \ - -name "$PRGNAM-$PRGNAM-v$VERSION-*" \) -print | head -1) -mkdir $PRGNAM-$VERSION -# The container directory (ansible-ansible-v{tag}...) must be stripped -tar xvf "$SOURCEFILE" -C $PRGNAM-$VERSION --strip 1 - +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* cd $PRGNAM-$VERSION -sudo chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; +chown -R root:root . +find -L . \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; patch -p1 < $CWD/Makefile.patch diff --git a/system/ansible/ansible.info b/system/ansible/ansible.info index 5776d2edbf6d..3b84e6812c48 100644 --- a/system/ansible/ansible.info +++ b/system/ansible/ansible.info @@ -1,8 +1,8 @@ PRGNAM="ansible" VERSION="1.2.1" HOMEPAGE="http://ansible.cc" -DOWNLOAD="http://github.com/ansible/ansible/tarball/release1.2.1" -MD5SUM="74c3e4770418d592dcd465b54e725872" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/ansible-1.2.1.tar.xz" +MD5SUM="b77aa517fd1917324de178056aaab90a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="paramiko PyYAML Jinja2" |