From: Chris Gianelloni Date: Tue, 29 Mar 2005 17:09:49 +0000 (+0000) Subject: Moved livecd-bash_profile to livecd-bashrc. Added check for /usr/livecd/profiles... X-Git-Tag: CATALYST_2_0_6_916~803 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2be6efa17583c30bedf8d45e717800bcda99a46a;p=catalyst.git Moved livecd-bash_profile to livecd-bashrc. Added check for /usr/livecd/profiles to livecd-local.start. Removed mkvardb. Removed legacy sed call from pre-kmerge.sh since it has been fixed in genkernel for a long time. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@570 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index 37e5a017..7f052f29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for gentoo/src/catalyst # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.195 2005/03/24 15:37:54 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.196 2005/03/29 17:09:49 wolf31o2 Exp $ + + 29 Mar 2005; Chris Gianelloni + -livecd/files/livecd-bash_profile, +livecd/files/livecd-bashrc, + livecd/files/livecd-local.start, -livecd/files/mkvardb, + livecd/runscript-support/pre-kmerge.sh, + livecd/runscript/default-runscript.sh: + Moved livecd-bash_profile to livecd-bashrc. Added check for + /usr/livecd/profiles to livecd-local.start. Removed mkvardb. Removed legacy + sed call from pre-kmerge.sh since it has been fixed in genkernel for a long + time. 24 Mar 2005; Chris Gianelloni arch/arm.py, catalyst, modules/generic_stage_target.py: diff --git a/livecd/files/livecd-bash_profile b/livecd/files/livecd-bashrc similarity index 100% rename from livecd/files/livecd-bash_profile rename to livecd/files/livecd-bashrc diff --git a/livecd/files/livecd-local.start b/livecd/files/livecd-local.start index e98ab087..f8fea18a 100644 --- a/livecd/files/livecd-local.start +++ b/livecd/files/livecd-local.start @@ -12,3 +12,8 @@ if [ -d /usr/livecd/db ] then ln -sf /usr/livecd/db /var/db fi + +if [ -d /usr/livecd/profiles ] +then + ln -sf /usr/livecd/profiles /usr/portage/profiles +fi diff --git a/livecd/files/mkvardb b/livecd/files/mkvardb deleted file mode 100755 index 9faca884..00000000 --- a/livecd/files/mkvardb +++ /dev/null @@ -1,185 +0,0 @@ -#!/bin/bash - -PROG=$(basename ${0}) -PORTDIR="$(portageq envvar PORTDIR)" -DB="/var/db/pkg" -filesindex=0 - -declare -a exclude -declare -a files - -function usage { - echo "Usage: $PROG [options] " - echo - echo "Options:" - echo " -h|--help Show this message" - echo " -c|--category Specifies the category for the package to be created" - echo " -p|--pkgname Specifies the name for the package to be created" - echo " -v|--version Specifies the version for the package to be created" -# echo " -m|--makevardb Creates the /var/db/pkg entry manually" -# echo " -e|--emerge Uses emerge to install the created ebuild" -# echo " -x|--exclude This is passed to tar when the specified files are" - echo " packaged. This option can be specified multiple times" - echo - echo "Parameters:" - echo " files These are the existing files that are to be packaged" -} - -function create_ebuild { - DIR="${PORTDIR_OVERLAY}/${category}/${pkgname}" - EBUILD="${DIR}/${pkgname}-${pkgver}.ebuild" - - mkdir -p $DIR - cat > $EBUILD <> /tmp/mkvardb_filelist - fi - echo ${i} >> /tmp/mkvardb_filelist - curdir=${i} - else - [ -d "${curdir}/${i}" ] && continue - echo "${curdir}/${i}" >> /tmp/mkvardb_filelist - fi - done - sort -u /tmp/mkvardb_filelist | sed -e 's://:/:' -} - -function create_vardb { - VARDBDIR="${DB}/${category}/${pkgname}-${pkgver}" - mkdir -p $VARDBDIR - cd $VARDBDIR - cp $EBUILD $VARDBDIR - touch ASFLAGS CATEGORY CBUILD CC CDEPEND CFLAGS CHOST CONTENTS COUNTER CTARGET CXX CXXFLAGS DEPEND EXTRA_ECONF EXTRA_EINSTALL EXTRA_EMAKE FEATURES INHERITED IUSE LDFLAGS LDFLAGS LIBCFLAGS LIBCXXFLAGS LICENSE PDEPEND PF PKGUSE PROVIDE RDEPEND RESTRICT SLOT USE - echo ${category} > CATEGORY - echo $(portageq envvar CFLAGS) > CFLAGS - echo $(portageq envvar CHOST) > CHOST - echo $(portageq envvar CTARGET) > CTARGET - echo $(portageq envvar CXXFLAGS) > CXXFLAGS - echo eutils > INHERITED - echo ${pkgname}-${pkgver} > PF - echo 0 > SLOT - echo $(portageq envvar USE) > USE - for i in $(sort_dirs_and_files); do - if [ -d ${i} ]; then - echo "dir ${i}" >> CONTENTS - else - time=$(stat -c %Y ${i}) - md5=$(md5sum ${i} | cut -d ' ' -f 1) - echo "obj ${i} $md5 $time" >> CONTENTS - fi - done -} - -# Parse args -params=${#} -while [ ${#} -gt 0 ] -do - a=${1} - shift - case "${a}" in - - -h|--help) - usage - exit 0 - ;; - - -c|--category) - category=$1 - shift - ;; - - -p|--pkgname) - pkgname=$1 - shift - ;; - - -v|--pkgversion) - pkgver=$1 - shift - ;; - -# -m|--makevardb) -# makevardb=1 -# emerge=0 -# ;; -# -# -e|--emerge) -# emerge=1 -# makevardb=0 -# ;; -# -# -x|--exclude) -# exclude[#exclude[@]]=$1 -# shift -# ;; -# - -*) - echo "You have specified an invalid option: ${a}" 1>&2 - usage - exit 1 - ;; - - *) - files[$filesindex]=$a - filesindex=$(expr $filesindex + 1) - ;; - - esac -done - -if [ "$category" = "" ]; then - echo "You must specify a category" 1>&2 - usage - exit 1 -fi -if [ "$pkgname" = "" ]; then - echo "You must specify a package name" 1>&2 - usage - exit 1 -fi -if [ "$pkgver" = "" ]; then - echo "You must specify a package version" 1>&2 - usage - exit 1 -fi -if [ $filesindex -eq 0 ]; then - echo "You must specify files to include in the package" 1>&2 - usage - exit 1 -fi - -create_ebuild -create_vardb diff --git a/livecd/runscript-support/pre-kmerge.sh b/livecd/runscript-support/pre-kmerge.sh index aff83103..009d1867 100755 --- a/livecd/runscript-support/pre-kmerge.sh +++ b/livecd/runscript-support/pre-kmerge.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/pre-kmerge.sh,v 1.11 2005/03/07 21:14:42 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/pre-kmerge.sh,v 1.12 2005/03/29 17:09:49 wolf31o2 Exp $ /usr/sbin/env-update source /etc/profile @@ -14,8 +14,6 @@ fi install -d /usr/portage/packages/gk_binaries rm -f /usr/src/linux -sed -i 's/uchi-hcd/uhci-hcd/' /usr/share/genkernel/x86/modules_load - if [ "${clst_livecd_type}" = "gentoo-release-minimal" ] \ || [ "${clst_livecd_type}" = "gentoo-release-universal" ] then diff --git a/livecd/runscript/default-runscript.sh b/livecd/runscript/default-runscript.sh index 87900db9..669e32c6 100644 --- a/livecd/runscript/default-runscript.sh +++ b/livecd/runscript/default-runscript.sh @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/default-runscript.sh,v 1.23 2005/03/24 14:17:29 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/default-runscript.sh,v 1.24 2005/03/29 17:09:49 wolf31o2 Exp $ #return codes to be used by archscript die() { @@ -141,13 +141,10 @@ case $1 in fi # move over the environment - cp ${clst_sharedir}/livecd/files/livecd-bash_profile \ - ${clst_chroot_path}/root/.bash_profile - touch ${clst_chroot_path}/root/.bashrc + cp ${clst_sharedir}/livecd/files/livecd-bashrc \ + ${clst_chroot_path}/root/.bashrc cp ${clst_sharedir}/livecd/files/livecd-local.start \ ${clst_chroot_path}/etc/conf.d/local.start - cp ${clst_sharedir}/livecd/files/mkvardb \ - ${clst_chroot_path}/tmp mkdir -p /usr/share/faces cp ${clst_sharedir}/livecd/files/gentoo.png \ ${clst_chroot_path}/usr/share/faces