Browse Source

Alejandro Mery <amery@geeks.cl>:

kiss: mount dir on dev o_O
linux24: comment for 99-mkdep-arglist-too-long.patch
perl5: $confopt expanded by hook_eval, not .conf
samba: prefix=opt/samba
download: cvs:// debuging flags removed


git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1903 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
rocklinux
Alejandro Mery 21 years ago
parent
commit
1b39da5d45
6 changed files with 49 additions and 7 deletions
  1. +1
    -0
      Documentation/Developers/CHANGELOG-RENE
  2. +36
    -0
      package/base/kiss/mount_typo.patch
  3. +6
    -0
      package/base/linux24/99-mkdep-arglist-too-long.patch
  4. +1
    -1
      package/base/perl5/perl5.conf
  5. +5
    -0
      package/rene/samba/samba.conf
  6. +0
    -6
      scripts/Download

+ 1
- 0
Documentation/Developers/CHANGELOG-RENE

@ -6,6 +6,7 @@
- Alejandro Mery: little bdb cleanup and CV-URL
updated gcc's ssp updated and new location
updated lprng
fixed varous typos and mini issues
*) 2003-11-29 (2.0.0-rc3 - 2.0.0-rc4)

+ 36
- 0
package/base/kiss/mount_typo.patch

@ -0,0 +1,36 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/base/kiss/mount_typo.patch
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version. A copy of the GNU General Public
# License can be found at Documentation/COPYING.
#
# Many people helped and are helping developing ROCK Linux. Please
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
# file for details.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
it's pretty weird to mount a directory at a device
- Alejandro
--- ./domount.c.orig 2003-10-25 00:03:15.000000000 -0300
+++ ./domount.c 2003-10-25 09:51:03.000000000 -0300
@@ -51,7 +51,7 @@
if (mount (s.str [optind], s.str [optind + 1], type, 1, 0))
error ("problem mounting \"%s\" on \"%s\" (type \"%s\")",
- s.str [optind + 1], s.str [optind], type);
+ s.str [optind], s.str [optind + 1], type);
if (! (mtab = fopen (MTAB, "a")) )
return (warning ("\"%s\" not updated", MTAB));

+ 6
- 0
package/base/linux24/99-mkdep-arglist-too-long.patch

@ -20,6 +20,12 @@
#
# --- ROCK-COPYRIGHT-NOTE-END ---
Depending on the working directory where the kernel is build, the file
list can grow to produce an "argument to long" error on mkdep line.
This patch only slits the process to have shorter lines.
- Alejandro
--- ./Makefile.orig 2003-09-23 22:19:55.000000000 -0400
+++ ./Makefile 2003-09-23 22:28:29.000000000 -0400
@@ -518,7 +518,9 @@

+ 1
- 1
package/base/perl5/perl5.conf

@ -48,7 +48,7 @@ confopt="-des -Dcc=gcc -Dprefix=/usr -Darchname=$arch_target \
[ "$ROCKCFG_PKG_PERL5_THREADS" = "1" ] && confopt="$confopt -Dusethreads"
[ "$ROCKCFG_PKG_PERL5_USE_DB3" = "1" ] && patchfiles="$patchfiles $confdir/use_db3.diff"
hook_add preconf 2 "( rm -f config.sh Policy.sh; sh Configure $confopt; )"
hook_add preconf 2 "( rm -f config.sh Policy.sh; sh Configure \$confopt; )"
hook_add postmake 4 "pkg_perl_postmake"
runconfig=0

+ 5
- 0
package/rene/samba/samba.conf

@ -20,6 +20,11 @@
#
# --- ROCK-COPYRIGHT-NOTE-END ---
if [ $prefix_auto = 1 ] ; then
prefix="opt/samba"
set_confopt
fi
var_append extraconfopt " " "--with-smbmount --with-automount \
--with-syslog --with-configdir=$sysconfdir \
--with-privatedir=$sysconfdir/private --with-codepagedir=$sysconfdir/codepages \

+ 0
- 6
scripts/Download

@ -499,7 +499,6 @@ download_file_now() {
# btw, at least current cvs supports password at CVSROOT.
url="${url#cvs://}"; url="${url%/*}"
echo "cvs://$url/"
# cvs://mode:loc::module!date/
#
@ -507,10 +506,6 @@ download_file_now() {
module="${loc##*::}"; loc="${loc%%::*}"
revision="${module#*!}"; module="${module%%!*}"
[[ $loc != *@* ]] && loc="anonymous@$loc"
echo "mode: $mode"
echo "loc : $loc"
echo "mod : $module"
echo "rev : $revision"
# everything after the first 'bang' (!) is analysed here
# someday we could add more cvs options.
@ -518,7 +513,6 @@ download_file_now() {
dat="$( echo $revision | \
sed -n -e 's,\([0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}\),-D \1,p' )"
echo "date: $dat"
cvsdir="src/down.cvsdir.`echo $bzfile | tr / -`"
saved_pwd=$PWD ; mkdir -p $cvsdir ; cd $cvsdir

Loading…
Cancel
Save