From f9a8dfcd51e481a49355d94a3e74f2762519378f Mon Sep 17 00:00:00 2001 From: rhatto Date: Sun, 11 Feb 2007 14:29:54 +0000 Subject: changed repository layout to trunk/, tags/ and branches/ scheme git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@181 04377dda-e619-0410-9926-eae83683ac58 --- conf/generic.mkSlackBuild.new | 224 ------------------------------------------ conf/repos.conf.new | 40 -------- conf/simplepkg.conf.new | 115 ---------------------- 3 files changed, 379 deletions(-) delete mode 100644 conf/generic.mkSlackBuild.new delete mode 100644 conf/repos.conf.new delete mode 100644 conf/simplepkg.conf.new (limited to 'conf') diff --git a/conf/generic.mkSlackBuild.new b/conf/generic.mkSlackBuild.new deleted file mode 100644 index e8c432a..0000000 --- a/conf/generic.mkSlackBuild.new +++ /dev/null @@ -1,224 +0,0 @@ -################################################### -## Generic template for SlackBuilds -## -## Version 0.3.3 - Luis ( luis at riseup d0t net) -## -################################################### - all -#!/bin/bash -# -# SlackBuild for [[PROGRAM NAME]] -# [[PROGRAM URL]] -# -# Author: [[SLACKBUILD AUTHOR]] -# - - - all -# Look for slackbuildrc -if [ -f ~/.slackbuildrc ]; then - source ~/.slackbuildrc -elif [ -f /etc/slackbuildrc ]; then - source /etc/slackbuildrc -fi - - - all -# Set variables -CWD=`pwd` -SRC_NAME="[[SOURCE NAME]]" -PKG_NAME="[[PACKAGE NAME]]" -ARCH=${ARCH:=[[ARCH]]} -VERSION=${VERSION:=[[VERSION]]} -BUILD=${BUILD:=1[[SLACKBUILD AUTHOR INITIALS]]} -SRC_DIR=${SRC_DIR:=$CWD} -TMP=${TMP:=/tmp} -PKG=${PKG:=$TMP/package-$PKG_NAME} -REPOS=${REPOS:=$TMP} -PREFIX=${PREFIX:=[[PREFIX]]} -PKG_SRC="$SRC_DIR/$SRC_NAME-$VERSION" - - - all -# Set system libraries' path and optmization flags based on $ARCH -LIBDIR="$PREFIX/lib" - -if [ "$ARCH" = "i386" ]; then - SLKCFLAGS="-O2 -march=i386 -mcpu=i686" -elif [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mcpu=i686" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2" - LIBDIR="$PREFIX/lib64" -fi - - - on -# Set error codes (used by createpkg) -ERROR_WGET=31; ERROR_MAKE=32; ERROR_INSTALL=33 -ERROR_MD5=34; ERROR_CONF=35; ERROR_HELP=36 -ERROR_TAR=37; ERROR_MKPKG=38; ERROR_GPG=39 -ERROR_PATCH=40; ERROR_VCS=41; ERROR_MKDIR=42 - - - all -# Clean up any leftovers of previous builds -rm -rf "$PKG_SRC" 2> /dev/null -rm -rf "$PKG" 2> /dev/null - -# Create directories, if necessary -mkdir -p "$SRC_DIR" || exit $ERROR_MKDIR -mkdir -p "$PKG" || exit $ERROR_MKDIR -mkdir -p "$REPOS" || exit $ERROR_MKDIR - - - off -# Import (minimized) signing key from -# [[SIGNING KEY URL]] -gpg --import << EOKEY || exit $ERROR_GPG -[[SIGNING KEY]] -EOKEY - - - on -# Dowload source and its signature, if necessary -SRC="$SRC_NAME-$VERSION.tar.[[SOURCE EXTENSION]]" -URL="[[DOWNLOAD FOLDER URL]]/$SRC" - -if [ ! -f "$SRC_DIR/$SRC" ] || ! [[DECOMPRESSOR]] [[DECOMPRESSOR TEST FLAG]] "$SRC_DIR/$SRC" 2> /dev/null; then - wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET -fi - - - off -if [ ! -f "$SRC_DIR/$SRC.sig" ]; then - wget "$URL.sig" -O "$SRC_DIR/$SRC.sig" || exit $ERROR_WGET -fi - -# Check source's signature -gpg --verify "$SRC_DIR/$SRC.sig" "$SRC_DIR/$SRC" || exit $ERROR_GPG - - - all -# Untar, patch, configure, compile and install -cd "$SRC_DIR" -tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR -cd "$PKG_SRC" - - - off -patch -Np[[NUMBER OF PREFIX SLASHES TO STRIP]] < "$CWD/[[PATCH FILE]]" - - - on -CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" \ - ./configure \ - --prefix="$PREFIX" --libdir="$LIBDIR" [[OTHER CONFIGURE ARGS]] || exit $ERROR_CONF - - - all -make || exit $ERROR_MAKE - - - all -make install DESTDIR="$PKG" || exit $ERROR_INSTALL - - - all -# Strip binaries -( cd "$PKG" - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ - xargs strip --strip-unneeded 2> /dev/null - find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \ - xargs strip --strip-unneeded 2> /dev/null -) - - - off -# Compress and link manpages -if [ -d "$PKG/$PREFIX/man" ]; then - ( cd "$PKG/$PREFIX/man" - for manpagedir in $(find . -type d -name "man*") ; do - ( cd $manpagedir - for eachpage in $( find . -type l -maxdepth 1) ; do - ln -s $( readlink $eachpage ).gz $eachpage.gz - rm $eachpage - done - gzip -9 *.? - ) - done - ) -fi - - - off -# Compress info files -if [ -d "$PKG/$PREFIX/info" ]; then - ( cd "$PKG/$PREFIX/info" - rm -f dir - gzip -9 * - ) -fi - - - on -# Install documentation -DOCS="[[DOCUMENTATION FILES]]" -mkdir -p "$PKG/$PREFIX/doc/$PKG_NAME-$VERSION" || exit $ERROR_MKDIR -cp -a $DOCS "$PKG/$PREFIX/doc/$PKG_NAME-$VERSION" - - - on -# Add package description (slack-desc) -mkdir -p "$PKG/install" || exit $ERROR_MKDIR -cat << EODESC > "$PKG/install/slack-desc" -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -[[SLACK-DESC]] -EODESC - - - off -# Add a post-installation script (doinst.sh) -cat << EOSCRIPT > "$PKG/install/doinst.sh" -config() { - NEW="\$1" - OLD="\$(dirname \$NEW)/\$(basename \$NEW .new)" - # If there's no config file by that name, mv it over: - if [ ! -r \$OLD ]; then - mv \$NEW \$OLD - elif [ "\$(cat \$OLD | md5sum)" = "\$(cat \$NEW | md5sum)" ]; then - # toss the redundant copy - rm \$NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... -} - -config path/to/config_file.new -[[REST OF DOINST.SH]] -EOSCRIPT - - - all -# Build the package -cd "$PKG" -makepkg -l y -c n "$REPOS/$PKG_NAME-$VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG - - - on -# Delete source and build directories, if requested -if [ "$CLEANUP" == "yes" ]; then - rm -rf "$PKG_SRC" "$PKG" -fi - diff --git a/conf/repos.conf.new b/conf/repos.conf.new deleted file mode 100644 index 930ff80..0000000 --- a/conf/repos.conf.new +++ /dev/null @@ -1,40 +0,0 @@ -# -# repository definitions for simplaret -# - -# root repositories -ROOT-i386="tds%http://slackware.mirrors.tds.net/pub/slackware/" -ROOT-i386="sarava%http://slack.sarava.org/slackware/" -ROOT-x86_64="sarava%http://slack.sarava.org/slamd64/" -ROOT-x86_64="slackadelic%http://mirror1.slackadelic.com/slamd64/" -ROOT-x86_64="heanet%http://ftp.heanet.ie/pub/slamd64/" -ROOT-powerpc="workaround%http://slackintosh.workaround.ch/pub/slackintosh/" -ROOT-s390="ibiblio%http://distro.ibiblio.org/pub/linux/distributions/slack390/" - -# noarch -NOARCH="sarava%http://slack.sarava.org/packages/noarch" - -# i386 10.2 -REPOS-i386-10.2="sarava%http://slack.sarava.org/packages/slackware/slackware-10.2/" -PATCHES-i386-10.2="sarava%http://slack.sarava.org/packages/slackware/slackware-10.2/patches/" - -# x86_64 10.2 -REPOS-x86_64-10.2="sarava%http://slack.sarava.org/packages/slamd64/slamd64-10.2/" -PATCHES-x86_64-10.2="sarava%http://slack.sarava.org/packages/slamd64/slamd64-10.2/patches/" - -# x86_64 10.2b -REPOS-x86_64-10.2b="sarava%http://slack.sarava.org/packages/slamd64/slamd64-10.2b/" -PATCHES-x86_64-10.2b=""sarava%http://slack.sarava.org/packages/slamd64/slamd64-10.2b/patches/" - -# i386 11.0 -REPOS-i386-11.0="sarava%http://slack.sarava.org/packages/slackware/slackware-11.0/" -PATCHES-i386-11.0="sarava%http://slack.sarava.org/packages/slackware/slackware-11.0/patches/" - -# x86_64 11.0 -REPOS-x86_64-11.0="sarava%http://slack.sarava.org/packages/slamd64/slamd64-11.0/" -PATCHES-x86_64-11.0="sarava%http://slack.sarava.org/slamd64/slamd64-11.0/patches/" - -# powerpc 11.0 -REPOS-powerpc-11.0="sarava%http://slack.sarava.org/packages/slackintosh/slackintosh-11.0/" -PATCHES-powerpc-11.0="workaround%http://slackintosh.workaround.ch/pub/slackintosh/11.0/patches/" - diff --git a/conf/simplepkg.conf.new b/conf/simplepkg.conf.new deleted file mode 100644 index 28af9a7..0000000 --- a/conf/simplepkg.conf.new +++ /dev/null @@ -1,115 +0,0 @@ -# -# /etc/simplepkg/simplepkg.conf -# - -# default architecture: set this option if you dont want simplepkg -# to use the value from /etc/slackware-version -# DEFAULT_ARCH="i386" - -# default version: set this option if you dont want simplepkg -# to use the value from /etc/slackware-version -# DEFAULT_VERSION="11.0" - -# where jails are placed -JAIL_ROOT="/vservers" - -# whether mkjail should clean the package cache before installation -# to enable it, set to "1" or "yes" -SIMPLARET_CLEAN="1" - -# whether mkjail should clean the package cache after the installation -# to enable it, set to "1" or "yes" -SIMPLARET_DELETE_DOWN="1" - -# whether mkjail should issue a simplaret --update before install the jail -# to enable it, set to "1" or "yes" -SIMPLARET_UPDATE="1" - -# wheter delete also patches when simplaret --purge is called -# to enable it, set to "1" or "yes" -SIMPLARET_PURGE_PATCHES="0" - -# whether delete each package rigth after its installation -# to enable it, set to "1" or "yes" -SIMPLARET_DELETE_DURING="0" - -# delete packages older than N weeks from the cache -SIMPLARET_PURGE_WEEKS="3" - -# where patches are placed -PATCHES_DIR="/var/simplaret/patches" - -# place to store your packages -STORAGE="/var/simplaret/packages" - -# whether to use passive ftp transfers -# to enable it, set to "1" or "yes" -PASSIVE_FTP="1" - -# http retrieval tool -# available parameters are "wget" or "curl" -HTTP_TOOL="wget" - -# ftp retrieval tool -# available parameters are "wget", "curl" or "ncftpget" -FTP_TOOL="wget" - -# set connection timeout in seconds -CONNECT_TIMEOUT="20" - -# ROOT repository package priority -ROOT_PRIORITY="patches slackware extra testing pasture" - -# whether to check package signatures (you should have the repository -# maintainer key on your keyring) -SIGNATURE_CHECKING="0" - -# whether simplaret will try to solve dependencies by looking -# for packages' slack-required -DEPENDENCY_CHECKING="1" - -# Enabling this option (i.e, setting to "1" or "yes"), simplaret will -# donwload even # already applied patches, a good option when you plan -# to keep local copies of all needed patches for your system -DOWNLOAD_EVEN_APPLIED_PATCHES="0" - -# Enabling this option (i.e, setting to "1" or "yes"), simplaret will -# look at your standard repositories for new packages; if it find a -# package with different version of your current installed package and -# also this package isnt in the packages folder, then the new package -# is applied; if in doubt, just say no or leave blank. Otherwise set it -# either to "yes" or "1" and remember that if enabling this feature can -# cause problems if you use more than one REPOS definition for each -# ARCH and VERSION. Also, this option can be very slow. -CONSIDER_ALL_PACKAGES_AS_PATCHES="0" - -# Enabling this option (i.e, setting to "1" or "yes"), simplaret will -# store patches it finds on ROOT repositories on -# -# $PATCHES_DIR/$ARCH/$VERSION/root-$repository_name. -# -# By default this option is turned off because it breaks the standard -# way to store packages and can cause some confusion, but its an useful -# feature if you like to see all patches apart from common packages and/or -# stored in the same tree. -STORE_ROOT_PATCHES_ON_PATCHES_DIR="0" - -# Set to yes if your templates will be placed in a subversion repository -# This just work if TEMPLATE_STORAGE_STYLE is set to own-folder (default) -TEMPLATES_UNDER_SVN="no" - -# Where your templates will be located -# Dont change it except you know what you're doing. -TEMPLATE_FOLDER="/etc/simplepkg/templates" - -# This variable controls in which folder / subfolder your templates will -# be stored. Possible values are: -# -# - simplepkg-folder: templates are stored at /etc/simplepkg -# - templates-folder: templates are stored at /etc/simplepkg/templates -# - own-folder: each template stored at its own folder -# at /etc/simplepkg/templates/template-name -# -# This variable has backwards purposes only, so dont change it. -TEMPLATE_STORAGE_STYLE="own-folder" - -- cgit v1.2.3