From 0f63f59fe31ab7f0bf31ba622c6b131921bb596d Mon Sep 17 00:00:00 2001 From: rhatto Date: Thu, 27 Nov 2008 02:00:38 +0000 Subject: lots of changes, see CHANGELOG for details git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@537 04377dda-e619-0410-9926-eae83683ac58 --- trunk/conf/repos.conf | 37 +++++++++ trunk/conf/repos.conf.new | 51 ------------ trunk/conf/simplepkg.conf | 180 ++++++++++++++++++++++++++++++++++++++++++ trunk/conf/simplepkg.conf.new | 163 -------------------------------------- 4 files changed, 217 insertions(+), 214 deletions(-) create mode 100644 trunk/conf/repos.conf delete mode 100644 trunk/conf/repos.conf.new create mode 100644 trunk/conf/simplepkg.conf delete mode 100644 trunk/conf/simplepkg.conf.new (limited to 'trunk/conf') diff --git a/trunk/conf/repos.conf b/trunk/conf/repos.conf new file mode 100644 index 0000000..fa06a8e --- /dev/null +++ b/trunk/conf/repos.conf @@ -0,0 +1,37 @@ +# +# repository definitions for simplaret +# please dont use any spaces inside a repository definition +# + +# slackware root repositories +#ROOT-i386="sarava%http://slack.sarava.org/slackware/" +ROOT-i386="tds%http://slackware.mirrors.tds.net/pub/slackware/" +ROOT-i386="easynews%http://slackware.mirrors.easynews.com/linux/slackware/" +ROOT-i386="gwdg%http://ftp.gwdg.de/pub/linux/slackware/" + +# powerpc root definitions +ROOT-powerpc="workaround%http://slackintosh.workaround.ch/pub/slackintosh/" + +# s390 root definitions +ROOT-s390="ibiblio%http://distro.ibiblio.org/pub/linux/distributions/slack390/" + +# slamd64 root repositories +#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/" + +# If you want to use Bluewhite64 instead of Slamd64, please uncoment the +# next line and make sure to comment out all other slamd64 repository definitions +#ROOT-x86_64="bluewhite64%http://mirror.inode.at/data/bluewhite64/" + +# If you want to use Sflack instead of Slamd64 or Bluewhite64, please uncoment +# the next line and make sure to comment out all other slamd64 and Bluewhite64 +# repository definitions +#ROOT-x86_64="bluewhite64%http://webftp.slackarea.net/pub/sflack/" + +# noarch +NOARCH="sarava%http://slack.sarava.org/packages/noarch" + +# i386 12.1 +REPOS-i386-12.1="sarava%http://slack.sarava.org/packages/slackware/slackware-12.1/" +PATCHES-i386-12.1="sarava%http://slack.sarava.org/packages/slackware/slackware-12.1/patches/" diff --git a/trunk/conf/repos.conf.new b/trunk/conf/repos.conf.new deleted file mode 100644 index 02ded08..0000000 --- a/trunk/conf/repos.conf.new +++ /dev/null @@ -1,51 +0,0 @@ -# -# repository definitions for simplaret -# please dont use any spaces inside a repository definition -# - -# root repositories -ROOT-i386="tds%http://slackware.mirrors.tds.net/pub/slackware/" -ROOT-i386="sarava%http://slack.sarava.org/slackware/" -ROOT-powerpc="workaround%http://slackintosh.workaround.ch/pub/slackintosh/" -ROOT-s390="ibiblio%http://distro.ibiblio.org/pub/linux/distributions/slack390/" -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/" -# If you want to use Bluewhite64 instead of Slamd64, please uncoment the -# next line and make sure to comment out all other slamd64 repository definitions -#ROOT-x86_64="bluewhite64%http://mirror.inode.at/data/bluewhite64/" -# If you want to use Sflack instead of Slamd64, please uncoment the -# next line and make sure to comment out all other slamd64 repository definitions -#ROOT-x86_64="bluewhite64%http://webftp.slackarea.net/pub/sflack/" - -# 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/" - -# i386 12.0 -REPOS-i386-12.0="sarava%http://slack.sarava.org/packages/slackware/slackware-12.0/" -PATCHES-i386-12.0="sarava%http://slack.sarava.org/packages/slackware/slackware-12.0/patches/" - diff --git a/trunk/conf/simplepkg.conf b/trunk/conf/simplepkg.conf new file mode 100644 index 0000000..9e7427d --- /dev/null +++ b/trunk/conf/simplepkg.conf @@ -0,0 +1,180 @@ +# +# /etc/simplepkg/default/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="12.1" + +# Temporary folder +TMP="/tmp" + +# Where jails are placed +JAIL_ROOT="/vservers" + +# Wheter mkjail should add new jails in the jail list; +# to enable it, set to "1" or "yes" +ADD_TO_JAIL_LIST="1" + +# 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 try to download from the next repository on failed download. +SIMPLARET_DOWNLOAD_FROM_NEXT_REPO="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/simplepkg/patches" + +# Place to store your packages +STORAGE="/var/simplepkg/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" + +# REPOS repository package priority +REPOS_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" + +#--------------------------------------------------------------------- +# MKBUILD AND CREATEPKG SECTION +#--------------------------------------------------------------------- +# Set SlackBuilds default directory from scripts +SLACKBUILDS_DIR="/var/simplepkg/slackbuilds" + +# Set mkbuild default directory from parameters files +MKBUILDS_DIR="/var/simplepkg/mkbuilds" + +# Set SlackBuilds svn default repository +SLACKBUILDS_SVN="http://slack.sarava.org/slackbuilds" + +# Set mkbuilds svn default repository +MKBUILDS_SVN="http://slack.sarava.org/mkbuilds" + +# Set binaries default repository directory +MAKEPKG_REPOS="/var/simplepkg/repos" + +# Set the binaries default repository nested folder, useful if you manage +# packages from different distribution versions and architectures in the +# same parent folder. +# +# You can use any string here and also de special parameters none, distro, +# arch and version. You can also mix more than one parameter, like +# "distro-version". +# +# Default value is "none", which means no nested folders. +MAKEPKG_REPOS_STYLE="none" + +# Set sources default directory +SOURCE_DIR="/var/simplepkg/sources" + +# Set color style +# possible values are: color,gray, none +COLOR_MODE="none" + +# Createpkg architecture +CREATE_ARCH="i486" + +# Remove build files +CREATE_CLEANUP="yes" + +# Remove old packages from repository tree by createpkg +REMOVE_OLD_PACKAGE="off" + +# Move package to SlackBuilds-like tree +MOVE_BIN_PACKAGE="on" + +# Move package's slack-required to binary repository +MOVE_SLACK_REQUIRED="on" + +#--------------------------------------------------------------------- diff --git a/trunk/conf/simplepkg.conf.new b/trunk/conf/simplepkg.conf.new deleted file mode 100644 index d5b2e2d..0000000 --- a/trunk/conf/simplepkg.conf.new +++ /dev/null @@ -1,163 +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="12.1" - -# Where jails are placed -JAIL_ROOT="/vservers" - -# Wheter mkjial should add new jails in the jail list; -# to enable it, set to "1" or "yes" -ADD_TO_JAIL_LIST="1" - -# 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 try to download from the next repository on failed download. -SIMPLARET_DOWNLOAD_FROM_NEXT_REPO="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/simplepkg/patches" - -# Place to store your packages -STORAGE="/var/simplepkg/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" - -# REPOS repository package priority -REPOS_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" - -#--------------------------------------------------------------------- -# MKBUILD AND CREATEPKG SECTION -#--------------------------------------------------------------------- -# Set SlackBuilds default directory from scripts -SLACKBUILDS_DIR="/var/simplepkg/slackbuilds" - -# Set mkbuild default directory from parameters files -MKBUILDS_DIR="/var/simplepkg/mkbuilds" - -# Set SlackBuilds svn default repository -SLACKBUILDS_SVN="http://slack.sarava.org/slackbuilds" - -# Set mkbuilds svn default repository -MKBUILDS_SVN="http://slack.sarava.org/mkbuilds" - -# Set binaries default repository directory -MAKEPKG_REPOS="/var/simplepkg/repos" - -# Set sources default directory -SOURCE_DIR="/var/simplepkg/sources" - -# Set color style -# possible values are: color,gray, none -COLOR_MODE="none" - -# Createpkg architecture -CREATE_ARCH="i486" - -# Remove build files -CREATE_CLEANUP="yes" - -# Remove old packages from repository tree by createpkg -REMOVE_OLD_PACKAGE="off" - -# Move package to SlackBuilds-like tree -MOVE_BIN_PACKAGE="on" - -#--------------------------------------------------------------------- -- cgit v1.2.3