From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 617841381F4 for ; Sun, 12 Aug 2012 19:05:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 380AAE0684; Sun, 12 Aug 2012 19:05:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id ECD09E0684 for ; Sun, 12 Aug 2012 19:05:01 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 310131B4030 for ; Sun, 12 Aug 2012 19:05:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 16D9CE5446 for ; Sun, 12 Aug 2012 19:04:59 +0000 (UTC) From: "Sebastian Pipping" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" Message-ID: <1344798205.6d35693a8b8c0baa95b20e4b41ef22eb981a5daa.sping@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: /, defaults/ X-VCS-Repository: proj/genkernel X-VCS-Files: ChangeLog defaults/software.sh genkernel.conf X-VCS-Directories: / defaults/ X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: 6d35693a8b8c0baa95b20e4b41ef22eb981a5daa X-VCS-Branch: master Date: Sun, 12 Aug 2012 19:04:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4c45dbe6-af5d-46a5-abba-e3b04b430be8 X-Archives-Hash: cb0bf8b97652f24873788a0f65c912b7 commit: 6d35693a8b8c0baa95b20e4b41ef22eb981a5daa Author: Sebastian Pipping pipping org> AuthorDate: Sun Aug 12 18:58:11 2012 +0000 Commit: Sebastian Pipping gentoo org> CommitDate: Sun Aug 12 19:03:25 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=6d35693a Move software version defaults for defaults/software.sh to ease the etc-update game --- ChangeLog | 5 ++++ defaults/software.sh | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++ genkernel.conf | 40 +-------------------------------------- 3 files changed, 57 insertions(+), 39 deletions(-) diff --git a/ChangeLog b/ChangeLog index bee9ecb..0e32e8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,11 @@ # Distributed under the GPL v2 # $Id$ + 12 Aug 2012; Sebastian Pipping +defaults/software.sh, + genkernel.conf: + Move software version defaults for defaults/software.sh to ease the + etc-update game + 12 Aug 2012; Sebastian Pipping genkernel: Fix parsing of --config=... command line option diff --git a/defaults/software.sh b/defaults/software.sh new file mode 100644 index 0000000..e0d2537 --- /dev/null +++ b/defaults/software.sh @@ -0,0 +1,51 @@ +# NOTE: +# - This file (software.sh) is sourced by /etc/genkernel.conf . +# Rather than changing this very file, please override specific versions/variables +# somewhere after the (existing) line +# +# source "${GK_SHARE}/defaults/software.sh" +# +# in /etc/genkernel.conf . +# +# - The *_VER variables below in here are/were filled with actual version strings +# by the genkernel ebuild. + +BUSYBOX_VER="VERSION_BUSYBOX" +BUSYBOX_SRCTAR="${DISTDIR}/busybox-${BUSYBOX_VER}.tar.bz2" +BUSYBOX_DIR="busybox-${BUSYBOX_VER}" +BUSYBOX_BINCACHE="%%CACHE%%/busybox-${BUSYBOX_VER}-%%ARCH%%.tar.bz2" + +LVM_VER="VERSION_LVM" +LVM_DIR="LVM2.${LVM_VER}" +LVM_SRCTAR="${DISTDIR}/LVM2.${LVM_VER}.tgz" +LVM_BINCACHE="%%CACHE%%/LVM2.${LVM_VER}-%%ARCH%%.tar.bz2" + +MDADM_VER="VERSION_MDADM" +MDADM_DIR="mdadm-${MDADM_VER}" +MDADM_SRCTAR="${DISTDIR}/mdadm-${MDADM_VER}.tar.bz2" +MDADM_BINCACHE="%%CACHE%%/mdadm-${MDADM_VER}-%%ARCH%%.tar.bz2" + +DMRAID_VER="VERSION_DMRAID" +DMRAID_DIR="dmraid/${DMRAID_VER}/dmraid" +DMRAID_SRCTAR="${DISTDIR}/dmraid-${DMRAID_VER}.tar.bz2" +DMRAID_BINCACHE="%%CACHE%%/dmraid-${DMRAID_VER}-%%ARCH%%.tar.bz2" + +ISCSI_VER="VERSION_ISCSI" +ISCSI_DIR="open-iscsi-${ISCSI_VER}" +ISCSI_SRCTAR="${DISTDIR}/open-iscsi-${ISCSI_VER}.tar.gz" +ISCSI_BINCACHE="%%CACHE%%/iscsi-${ISCSI_VER}-%%ARCH%%.bz2" + +FUSE_VER="VERSION_FUSE" +FUSE_DIR="fuse-${FUSE_VER}" +FUSE_SRCTAR="${DISTDIR}/fuse-${FUSE_VER}.tar.gz" +FUSE_BINCACHE="%%CACHE%%/fuse-${FUSE_VER}-%%ARCH%%.tar.bz2" + +UNIONFS_FUSE_VER="VERSION_UNIONFS_FUSE" +UNIONFS_FUSE_DIR="unionfs-fuse-${UNIONFS_FUSE_VER}" +UNIONFS_FUSE_SRCTAR="${DISTDIR}/unionfs-fuse-${UNIONFS_FUSE_VER}.tar.bz2" +UNIONFS_FUSE_BINCACHE="%%CACHE%%/unionfs-fuse-${UNIONFS_FUSE_VER}-%%ARCH%%.bz2" + +GPG_VER="VERSION_GPG" +GPG_DIR="gnupg-${GPG_VER}" +GPG_SRCTAR="${DISTDIR}/gnupg-${GPG_VER}.tar.bz2" +GPG_BINCACHE="%%CACHE%%/gnupg-${GPG_VER}-%%ARCH%%.bz2" diff --git a/genkernel.conf b/genkernel.conf index f50dd5f..8e9e424 100644 --- a/genkernel.conf +++ b/genkernel.conf @@ -198,47 +198,9 @@ DEFAULT_KERNEL_SOURCE="/usr/src/linux" # Specifies a user created busybox config #BUSYBOX_CONFIG="/path/to/file" - -BUSYBOX_VER="VERSION_BUSYBOX" -BUSYBOX_SRCTAR="${DISTDIR}/busybox-${BUSYBOX_VER}.tar.bz2" -BUSYBOX_DIR="busybox-${BUSYBOX_VER}" -BUSYBOX_BINCACHE="%%CACHE%%/busybox-${BUSYBOX_VER}-%%ARCH%%.tar.bz2" #BUSYBOX_APPLETS="[ ash sh mount uname echo cut cat" -LVM_VER="VERSION_LVM" -LVM_DIR="LVM2.${LVM_VER}" -LVM_SRCTAR="${DISTDIR}/LVM2.${LVM_VER}.tgz" -LVM_BINCACHE="%%CACHE%%/LVM2.${LVM_VER}-%%ARCH%%.tar.bz2" - -MDADM_VER="VERSION_MDADM" -MDADM_DIR="mdadm-${MDADM_VER}" -MDADM_SRCTAR="${DISTDIR}/mdadm-${MDADM_VER}.tar.bz2" -MDADM_BINCACHE="%%CACHE%%/mdadm-${MDADM_VER}-%%ARCH%%.tar.bz2" - -DMRAID_VER="VERSION_DMRAID" -DMRAID_DIR="dmraid/${DMRAID_VER}/dmraid" -DMRAID_SRCTAR="${DISTDIR}/dmraid-${DMRAID_VER}.tar.bz2" -DMRAID_BINCACHE="%%CACHE%%/dmraid-${DMRAID_VER}-%%ARCH%%.tar.bz2" - -ISCSI_VER="VERSION_ISCSI" -ISCSI_DIR="open-iscsi-${ISCSI_VER}" -ISCSI_SRCTAR="${DISTDIR}/open-iscsi-${ISCSI_VER}.tar.gz" -ISCSI_BINCACHE="%%CACHE%%/iscsi-${ISCSI_VER}-%%ARCH%%.bz2" - -FUSE_VER="VERSION_FUSE" -FUSE_DIR="fuse-${FUSE_VER}" -FUSE_SRCTAR="${DISTDIR}/fuse-${FUSE_VER}.tar.gz" -FUSE_BINCACHE="%%CACHE%%/fuse-${FUSE_VER}-%%ARCH%%.tar.bz2" - -UNIONFS_FUSE_VER="VERSION_UNIONFS_FUSE" -UNIONFS_FUSE_DIR="unionfs-fuse-${UNIONFS_FUSE_VER}" -UNIONFS_FUSE_SRCTAR="${DISTDIR}/unionfs-fuse-${UNIONFS_FUSE_VER}.tar.bz2" -UNIONFS_FUSE_BINCACHE="%%CACHE%%/unionfs-fuse-${UNIONFS_FUSE_VER}-%%ARCH%%.bz2" - -GPG_VER="VERSION_GPG" -GPG_DIR="gnupg-${GPG_VER}" -GPG_SRCTAR="${DISTDIR}/gnupg-${GPG_VER}.tar.bz2" -GPG_BINCACHE="%%CACHE%%/gnupg-${GPG_VER}-%%ARCH%%.bz2" +source "${GK_SHARE}/defaults/software.sh" # =========MISC KERNEL CONFIGURATION============