PERFORCE change 137178 for review
Marcel Moolenaar
marcel at FreeBSD.org
Sat Mar 8 19:23:24 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=137178
Change 137178 by marcel at marcel_cluster on 2008/03/08 19:23:22
IFC @137177
Affected files ...
.. //depot/projects/e500/sbin/geom/class/multipath/gmultipath.8#2 integrate
.. //depot/projects/e500/share/man/man3/Makefile#3 integrate
.. //depot/projects/e500/sys/dev/hptrr/hptrr_os_bsd.c#3 integrate
.. //depot/projects/e500/sys/dev/hptrr/hptrr_osm_bsd.c#4 integrate
.. //depot/projects/e500/sys/dev/hptrr/ldm.h#3 integrate
.. //depot/projects/e500/sys/dev/hptrr/osm.h#3 integrate
.. //depot/projects/e500/sys/kern/kern_sig.c#10 integrate
.. //depot/projects/e500/sys/modules/zfs/Makefile#6 integrate
.. //depot/projects/e500/sys/powerpc/booke/machdep.c#15 integrate
.. //depot/projects/e500/tools/tools/tinybsd/tinybsd#3 integrate
.. //depot/projects/e500/usr.bin/calendar/calendars/calendar.freebsd#11 integrate
Differences ...
==== //depot/projects/e500/sbin/geom/class/multipath/gmultipath.8#2 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/sbin/geom/class/multipath/gmultipath.8,v 1.4 2007/05/06 00:31:38 pjd Exp $
+.\" $FreeBSD: src/sbin/geom/class/multipath/gmultipath.8,v 1.5 2008/03/08 12:13:00 brueffer Exp $
.\"
.Dd February 26, 2007
.Dt GMULTIPATH 8
@@ -59,7 +59,7 @@
This operation writes a label on the last sector of the underlying
disk device with a contained name and UUID.
The UUID guarantees uniqueness
-in in a shared storage environment but is in general too cumbersome to use.
+in a shared storage environment but is in general too cumbersome to use.
The name is what is exported via the device interface.
.Pp
The first argument to
@@ -221,7 +221,7 @@
gmultipath label -v Fred /dev/da0 /dev/da2
disklabel -Brw /dev/multipath/Fred auto
newfs /dev/multipath/Freda
-mount /dev/mutlpath/Freda /mnt....
+mount /dev/multipath/Freda /mnt....
.Ed
.Pp
The resultant console output looks something like:
==== //depot/projects/e500/share/man/man3/Makefile#3 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.2 (Berkeley) 12/13/93
-# $FreeBSD: src/share/man/man3/Makefile,v 1.45 2007/10/09 23:31:10 obrien Exp $
+# $FreeBSD: src/share/man/man3/Makefile,v 1.46 2008/03/07 22:29:53 jasone Exp $
.include <bsd.own.mk>
@@ -111,6 +111,7 @@
tree.3 RB_ENTRY.3 \
tree.3 RB_FIND.3 \
tree.3 RB_FOREACH.3 \
+ tree.3 RB_FOREACH_REVERSE.3 \
tree.3 RB_GENERATE.3 \
tree.3 RB_GENERATE_STATIC.3 \
tree.3 RB_HEAD.3 \
@@ -123,6 +124,7 @@
tree.3 RB_NEXT.3 \
tree.3 RB_NFIND.3 \
tree.3 RB_PARENT.3 \
+ tree.3 RB_PREV.3 \
tree.3 RB_PROTOTYPE.3 \
tree.3 RB_PROTOTYPE_STATIC.3 \
tree.3 RB_REMOVE.3 \
==== //depot/projects/e500/sys/dev/hptrr/hptrr_os_bsd.c#3 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/hptrr/hptrr_os_bsd.c,v 1.3 2008/02/06 05:33:17 scottl Exp $
+ * $FreeBSD: src/sys/dev/hptrr/hptrr_os_bsd.c,v 1.4 2008/03/08 18:06:48 scottl Exp $
*/
#include <dev/hptrr/hptrr_config.h>
/* $Id: os_bsd.c,v 1.11 2005/06/03 14:06:38 kdh Exp $
@@ -132,7 +132,7 @@
list->dma = 0;
list->size = size;
list->head = 0;
-#ifdef DBG
+#if DBG
list->reserved_count =
#endif
list->count = count;
@@ -172,7 +172,7 @@
list->alignment = alignment;
list->size = size;
list->head = 0;
-#ifdef DBG
+#if DBG
list->reserved_count =
#endif
list->count = count;
@@ -289,7 +289,7 @@
return printf("%s: %s\n", driver_name, buf);
}
-#ifdef DBG
+#if DBG
void os_check_stack(const char *location, int size){}
void __os_dbgbreak(const char *file, int line)
==== //depot/projects/e500/sys/dev/hptrr/hptrr_osm_bsd.c#4 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/hptrr/hptrr_osm_bsd.c,v 1.3 2008/02/06 00:59:38 scottl Exp $
+ * $FreeBSD: src/sys/dev/hptrr/hptrr_osm_bsd.c,v 1.4 2008/03/08 18:06:48 scottl Exp $
*/
#include <dev/hptrr/hptrr_config.h>
/* $Id: osm_bsd.c,v 1.27 2007/11/22 07:35:49 gmm Exp $
@@ -205,7 +205,7 @@
BUS_ADDRESS bus;
for (f=vbus_ext->freelist_head; f; f=f->next) {
-#ifdef DBG
+#if DBG
if (f->count!=f->reserved_count) {
KdPrint(("memory leak for freelist %s (%d/%d)", f->tag, f->count, f->reserved_count));
}
@@ -222,7 +222,7 @@
for (f=vbus_ext->freelist_dma_head; f; f=f->next) {
int order, size;
-#ifdef DBG
+#if DBG
if (f->count!=f->reserved_count) {
KdPrint(("memory leak for dma freelist %s (%d/%d)", f->tag, f->count, f->reserved_count));
}
==== //depot/projects/e500/sys/dev/hptrr/ldm.h#3 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/hptrr/ldm.h,v 1.2 2008/02/06 00:59:38 scottl Exp $
+ * $FreeBSD: src/sys/dev/hptrr/ldm.h,v 1.3 2008/03/08 18:06:48 scottl Exp $
*/
#include <dev/hptrr/hptrr_config.h>
/*
@@ -76,7 +76,7 @@
HPT_UINT size;
void * head;
struct freelist *next;
-#ifdef DBG
+#if DBG
char *tag;
HPT_UINT reserved_count;
#define freelist_debug_tag(list, _tag) (list)->tag = _tag
==== //depot/projects/e500/sys/dev/hptrr/osm.h#3 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/hptrr/osm.h,v 1.3 2008/02/06 05:33:17 scottl Exp $
+ * $FreeBSD: src/sys/dev/hptrr/osm.h,v 1.4 2008/03/08 18:06:48 scottl Exp $
*/
#include <dev/hptrr/hptrr_config.h>
/*
@@ -187,7 +187,7 @@
/* debug support */
int os_printk(char *fmt, ...);
-#ifdef DBG
+#if DBG
extern int hptrr_dbg_level;
#define KdPrint(x) do { if (hptrr_dbg_level) os_printk x; } while (0)
void __os_dbgbreak(const char *file, int line);
==== //depot/projects/e500/sys/kern/kern_sig.c#10 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.355 2008/01/13 14:44:09 attilio Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.357 2008/03/08 16:31:29 rwatson Exp $");
#include "opt_compat.h"
#include "opt_ktrace.h"
@@ -60,6 +60,7 @@
#include <sys/posix4.h>
#include <sys/pioctl.h>
#include <sys/resourcevar.h>
+#include <sys/sbuf.h>
#include <sys/sleepqueue.h>
#include <sys/smp.h>
#include <sys/stat.h>
@@ -2973,65 +2974,59 @@
* by using "/dev/null", or all core files can be stored in "/cores/%U/%N-%P".
* This is controlled by the sysctl variable kern.corefile (see above).
*/
-
static char *
expand_name(name, uid, pid)
const char *name;
uid_t uid;
pid_t pid;
{
- const char *format, *appendstr;
+ struct sbuf sb;
+ const char *format;
char *temp;
- char buf[11]; /* Buffer for pid/uid -- max 4B */
- size_t i, l, n;
+ size_t i;
format = corefilename;
temp = malloc(MAXPATHLEN, M_TEMP, M_NOWAIT | M_ZERO);
if (temp == NULL)
return (NULL);
- for (i = 0, n = 0; n < MAXPATHLEN && format[i]; i++) {
+ (void)sbuf_new(&sb, temp, MAXPATHLEN, SBUF_FIXEDLEN);
+ for (i = 0; format[i]; i++) {
switch (format[i]) {
case '%': /* Format character */
i++;
switch (format[i]) {
case '%':
- appendstr = "%";
+ sbuf_putc(&sb, '%');
break;
case 'N': /* process name */
- appendstr = name;
+ sbuf_printf(&sb, "%s", name);
break;
case 'P': /* process id */
- sprintf(buf, "%u", pid);
- appendstr = buf;
+ sbuf_printf(&sb, "%u", pid);
break;
case 'U': /* user id */
- sprintf(buf, "%u", uid);
- appendstr = buf;
+ sbuf_printf(&sb, "%u", uid);
break;
default:
- appendstr = "";
log(LOG_ERR,
- "Unknown format character %c in `%s'\n",
- format[i], format);
+ "Unknown format character %c in "
+ "corename `%s'\n", format[i], format);
}
- l = strlen(appendstr);
- if ((n + l) >= MAXPATHLEN)
- goto toolong;
- memcpy(temp + n, appendstr, l);
- n += l;
break;
default:
- temp[n++] = format[i];
+ sbuf_putc(&sb, format[i]);
}
}
- if (format[i] != '\0')
- goto toolong;
+ if (sbuf_overflowed(&sb)) {
+ sbuf_delete(&sb);
+ log(LOG_ERR, "pid %ld (%s), uid (%lu): corename is too "
+ "long\n", (long)pid, name, (u_long)uid);
+ free(temp, M_TEMP);
+ return (NULL);
+ }
+ sbuf_finish(&sb);
+ sbuf_delete(&sb);
return (temp);
-toolong:
- log(LOG_ERR, "pid %ld (%s), uid (%lu): corename is too long\n",
- (long)pid, name, (u_long)uid);
- free(temp, M_TEMP);
- return (NULL);
}
/*
@@ -3063,6 +3058,7 @@
name = expand_name(p->p_comm, td->td_ucred->cr_uid, p->p_pid);
if (name == NULL) {
+ PROC_UNLOCK(p);
#ifdef AUDIT
audit_proc_coredump(td, NULL, EINVAL);
#endif
==== //depot/projects/e500/sys/modules/zfs/Makefile#6 (text+ko) ====
@@ -1,14 +1,16 @@
-# $FreeBSD: src/sys/modules/zfs/Makefile,v 1.8 2008/02/21 11:11:06 ru Exp $
+# $FreeBSD: src/sys/modules/zfs/Makefile,v 1.9 2008/03/08 19:14:43 obrien Exp $
KMOD= zfs
SRCS= vnode_if.h
-.PATH: ${.CURDIR}/../../contrib/opensolaris/common/acl
+SUNW= ${.CURDIR}/../../contrib/opensolaris
+
+.PATH: ${SUNW}/common/acl
SRCS+= acl_common.c
-.PATH: ${.CURDIR}/../../contrib/opensolaris/common/avl
+.PATH: ${SUNW}/common/avl
SRCS+= avl.c
-.PATH: ${.CURDIR}/../../contrib/opensolaris/common/nvpair
+.PATH: ${SUNW}/common/nvpair
SRCS+= nvpair.c
.PATH: ${.CURDIR}/../../compat/opensolaris/kern
@@ -22,28 +24,28 @@
SRCS+= opensolaris_zone.c
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64"
-.PATH: ${.CURDIR}/../../contrib/opensolaris/common/atomic/${MACHINE_ARCH}
+.PATH: ${SUNW}/common/atomic/${MACHINE_ARCH}
SRCS+= atomic.S
.else
.PATH: ${.CURDIR}/../../compat/opensolaris/kern
SRCS+= opensolaris_atomic.c
.endif
-.PATH: ${.CURDIR}/../../contrib/opensolaris/uts/common/fs
+.PATH: ${SUNW}/uts/common/fs
SRCS+= gfs.c
-.PATH: ${.CURDIR}/../../contrib/opensolaris/uts/common/os
+.PATH: ${SUNW}/uts/common/os
SRCS+= callb.c
SRCS+= list.c
SRCS+= nvpair_alloc_system.c
SRCS+= taskq.c
-.PATH: ${.CURDIR}/../../contrib/opensolaris/uts/common/rpc
+.PATH: ${SUNW}/uts/common/rpc
SRCS+= xdr.c
SRCS+= xdr_array.c
SRCS+= xdr_mem.c
-.PATH: ${.CURDIR}/../../contrib/opensolaris/uts/common/zmod
+.PATH: ${SUNW}/uts/common/zmod
SRCS+= adler32.c
SRCS+= crc32.c
SRCS+= deflate.c
@@ -55,9 +57,9 @@
SRCS+= zmod_subr.c
SRCS+= zutil.c
-.PATH: ${.CURDIR}/../../contrib/opensolaris/common/zfs
-.include "${.CURDIR}/../../contrib/opensolaris/uts/common/Makefile.files"
-.PATH: ${.CURDIR}/../../contrib/opensolaris/uts/common/fs/zfs
+.PATH: ${SUNW}/common/zfs
+.include "${SUNW}/uts/common/Makefile.files"
+.PATH: ${SUNW}/uts/common/fs/zfs
ZFS_SRCS= ${ZFS_OBJS:C/.o$/.c/}
SRCS+= ${ZFS_SRCS}
SRCS+= vdev_geom.c
@@ -69,12 +71,12 @@
CFLAGS+=-DFREEBSD_NAMECACHE
CFLAGS+=-I${.CURDIR}/../../compat/opensolaris
-CFLAGS+=-I${.CURDIR}/../../contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+=-I${.CURDIR}/../../contrib/opensolaris/uts/common/zmod
-CFLAGS+=-I${.CURDIR}/../../contrib/opensolaris/uts/common
+CFLAGS+=-I${SUNW}/uts/common/fs/zfs
+CFLAGS+=-I${SUNW}/uts/common/zmod
+CFLAGS+=-I${SUNW}/uts/common
CFLAGS+=-I${.CURDIR}/../..
-CFLAGS+=-I${.CURDIR}/../../contrib/opensolaris/common/zfs
-CFLAGS+=-I${.CURDIR}/../../contrib/opensolaris/common
+CFLAGS+=-I${SUNW}/common/zfs
+CFLAGS+=-I${SUNW}/common
CFLAGS+=-I${.CURDIR}/../../../include
#CFLAGS+=-DDEBUG=1
==== //depot/projects/e500/sys/powerpc/booke/machdep.c#15 (text+ko) ====
@@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/powerpc/booke/machdep.c,v 1.1 2008/03/03 17:17:00 raj Exp $");
+__FBSDID("$FreeBSD: src/sys/powerpc/booke/machdep.c,v 1.2 2008/03/08 05:36:25 marcel Exp $");
#include "opt_compat.h"
#include "opt_kstack_pages.h"
@@ -158,6 +158,11 @@
extern unsigned char kstack0_space[];
+extern void dcache_enable(void);
+extern void dcache_inval(void);
+extern void icache_enable(void);
+extern void icache_inval(void);
+
struct kva_md_info kmi;
struct pcpu __pcpu[MAXCPU];
struct trapframe frame0;
@@ -170,9 +175,6 @@
char machine[] = "powerpc";
SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD, machine, 0, "");
-static char model[128];
-SYSCTL_STRING(_hw, HW_MODEL, model, CTLFLAG_RD, model, 0, "");
-
static int cacheline_size = CACHELINESIZE;
SYSCTL_INT(_machdep, CPU_CACHELINE, cacheline_size,
CTLFLAG_RD, &cacheline_size, 0, "");
@@ -318,6 +320,7 @@
void *kmdp;
vm_offset_t end;
struct bi_mem_region *mr;
+ uint32_t csr;
int i;
kmdp = NULL;
@@ -440,6 +443,28 @@
mtmsr(mfmsr() | PSL_ME);
isync();
+ /* Enable D-cache if applicable */
+ csr = mfspr(SPR_L1CSR0);
+ if ((csr & L1CSR0_DCE) == 0) {
+ dcache_inval();
+ dcache_enable();
+ }
+ csr = mfspr(SPR_L1CSR0);
+ if ((boothowto & RB_VERBOSE) != 0 || (csr & L1CSR0_DCE) == 0)
+ printf("L1 D-cache %sabled\n",
+ (csr & L1CSR0_DCE) ? "en" : "dis");
+
+ /* Enable L1 I-cache if applicable. */
+ csr = mfspr(SPR_L1CSR1);
+ if ((csr & L1CSR1_ICE) == 0) {
+ icache_inval();
+ icache_enable();
+ }
+ csr = mfspr(SPR_L1CSR1);
+ if ((boothowto & RB_VERBOSE) != 0 || (csr & L1CSR1_ICE) == 0)
+ printf("L1 I-cache %sabled\n",
+ (csr & L1CSR1_ICE) ? "en" : "dis");
+
debugf("e500_init: e\n");
}
==== //depot/projects/e500/tools/tools/tinybsd/tinybsd#3 (text+ko) ====
@@ -3,7 +3,7 @@
# <jmelo at FreeBSD.org>
# Patrick Tracanelli <eksffa at freebsdbrasil.com.br>
#
-# $FreeBSD: src/tools/tools/tinybsd/tinybsd,v 1.7 2007/08/22 18:44:59 remko Exp $
+# $FreeBSD: src/tools/tools/tinybsd/tinybsd,v 1.8 2008/03/08 15:41:06 remko Exp $
#set -xv
CURRENTDIR=/usr/src/tools/tools/tinybsd
if [ ! -d $CURRENTDIR ]
@@ -12,13 +12,12 @@
else
cd $CURRENTDIR
fi
+
WORKDIR=/usr/obj/tinybsdbuild
KERNCONF=TINYBSD
BASEFILE="tinybsd.basefiles"
PORTSFILE="tinybsd.ports"
PORTSDIR=/usr/ports
-PKGDIRS=/tmp/pkg.dirs
-PKGFILES=/tmp/pkg.files
DEFINSTARGS="-o 0 -g 0 -m 555"
TS="=====>"
@@ -276,7 +275,7 @@
copy_binaries() {
cd ${CURRENTDIR}/conf/${CONF}
- for file in `cat ${BASEFILE} | grep -v "#" | \
+ for file in `cat ${CURRENTDIR}/conf/${CONF}/${BASEFILE} | grep -v "#" | \
cut -f1 -d":" | sort | uniq` ; do
echo "${TS} Copying "/${file}" to "${WORKDIR}/${file}
cp -fp /${file} ${WORKDIR}/${file} ;
@@ -284,41 +283,44 @@
}
install_ports() {
- for portname in `cat ${PORTSFILE} | grep -v '#'` ; do
- cd ${PORTSDIR}/${portname}
- pkgname=`make -V PKGNAME`
- pkg_info -VQ ${pkgname}
- install=`echo $?`
- if [ ${install} -eq 0 ] ; then
- echo "$portname is already installed..."
- create_missingdir
- copy_ports
- else
- make install clean
- create_missingdir
- copy_ports
- fi
- done
-}
+ for portname in `cat ${CURRENTDIR}/conf/${CONF}/${PORTSFILE} | grep -v '#'` ; do
+ if [ ! -d "${WORKDIR}/usr/ports" ]; then
+ mkdir -p "${WORKDIR}/usr/ports"
+ fi
+
+ PNAME=`/usr/bin/basename "${portname}"`
+ PORT_OPTION_FILE="/var/db/ports/${PNAME}/options"
+
+ if [ -f "${PORT_OPTION_FILE}" ]; then
+ mkdir -p "${WORKDIR}/var/db/ports/${PNAME}"
+ cp "${PORT_OPTION_FILE}" "${WORKDIR}/var/db/ports/${PNAME}/"
+ fi
+
+ mount_nullfs /lib "${WORKDIR}/lib"
+ mount_nullfs /usr/bin "${WORKDIR}/usr/bin"
+ mount_nullfs /usr/sbin "${WORKDIR}/usr/sbin"
+ mount_nullfs /usr/ports "${WORKDIR}/usr/ports"
+ mount_nullfs /usr/share "${WORKDIR}/usr/share"
+ mount_nullfs /usr/libexec "${WORKDIR}/usr/libexec"
+ mount_nullfs /usr/lib "${WORKDIR}/usr/lib"
+ mount_nullfs /usr/include "${WORKDIR}/usr/include"
+
+ cd ${PORTSDIR}/${portname}
+ make fetch-recursive
+ make DESTDIR_ENV_LIST=PATH DESTDIR="${WORKDIR}" install
+ make clean
-create_missingdir() {
-pkg_info -L ${pkgname} | egrep -v '(Information|Files|www|share|doc|man|include)' | sort | uniq >> ${PKGDIRS}
- for dir in `cat ${PKGDIRS}`; do
- if [ ! -d `dirname ${WORKDIR}/${dir}` ] ; then
- mkdir -p `dirname ${WORKDIR}/${dir}`
- fi
+ umount "${WORKDIR}/lib"
+ umount "${WORKDIR}/usr/ports"
+ umount "${WORKDIR}/usr/bin"
+ umount "${WORKDIR}/usr/sbin"
+ umount "${WORKDIR}/usr/share"
+ umount "${WORKDIR}/usr/libexec"
+ umount "${WORKDIR}/usr/lib"
+ umount "${WORKDIR}/usr/include"
done
- rm ${PKGDIRS}
}
-copy_ports() {
-pkg_info -L ${pkgname} | egrep -v '(Information|Files|www|share|doc|man|include)' >> ${PKGFILES}
- for port in `cat ${PKGFILES}` ; do
- echo "${TS} Copying "${port}" to "${WORKDIR}${port}
- cp -fp ${port} ${WORKDIR}${port} ;
- done
-}
-
make_kernel() {
echo "${TS} Building customized tiny beastie kernel... "
cp -p ${CURRENTDIR}/conf/${CONF}/${KERNCONF} /usr/src/sys/i386/conf
@@ -336,13 +338,10 @@
TDEPFILE="`mktemp -t deps`"
TDEPFILES="`mktemp -t depsymlnk`"
- cd ${CURRENTDIR}/conf/${CONF}
- for file in `cat ${BASEFILE} ${PKGFILES} | grep -v "#" | cut -f1 -d":"`; do
- ldd -f "%p\n" /${file} >> ${TDEPFILE} ; # don't worry on progs been "not dynamic"
+ find "${WORKDIR}" -type f |while read file; do
+ ldd -f "%p\n" ${file} >> ${TDEPFILE} ; # don't worry on progs been "not dynamic"
done
- rm ${PKGFILES}
-
for libdeplib in `cat ${TDEPFILE} | sort | uniq`; do
ldd -f "%p\n" /${libdeplib} >> ${TDEPFILE} ;
done
@@ -378,15 +377,6 @@
rm -fv ${TDEPFILE} ${TDEPFILES}
}
-deinstall_ports() {
- for portname in `cat ${PORTSFILE} | grep -v '#'` ; do
- cd ${PORTSDIR}/${portname}
- if [ $? -ne ${install} ] ; then
- make deinstall
- fi
- done
-}
-
create_etc() {
cd /usr/src/etc/sendmail/
make freebsd.cf freebsd.submit.cf
@@ -416,7 +406,7 @@
symlinks() {
#set -xv
- for i in `cat ${BASEFILE} ${PORTSFILE} | grep -v "#" | grep ":"`; do
+ for i in `cat ${CURRENTDIR}/conf/${CONF}/${BASEFILE}| grep -v "#" | grep ":"`; do
SOURCE_FILE=`echo $i | awk -F ":" {'print $1'}`
TARGET_FILE=`echo $i | awk -F ":" {'print $2'}`
chroot ${WORKDIR} /bin/ln -vs /${SOURCE_FILE} ${TARGET_FILE}
@@ -489,7 +479,6 @@
echo "${TS} You can see your build log in ${HOME}/tinybsd.log"
echo "${TS} Your final image is in ${CURRENTDIR}/${IMG}"
echo "${TS} Now use dd(1) to write it."
-
}
##########################
@@ -514,12 +503,11 @@
check_alt_imgname
create_tree
copy_binaries
+ create_etc
install_ports
make_kernel
copy_libraries
symlinks
- deinstall_ports
- create_etc
create_ssh_keys
personal_conf
create_image
==== //depot/projects/e500/usr.bin/calendar/calendars/calendar.freebsd#11 (text+ko) ====
@@ -1,7 +1,7 @@
/*
* FreeBSD
*
- * $FreeBSD: src/usr.bin/calendar/calendars/calendar.freebsd,v 1.227 2008/03/03 13:14:39 jadawin Exp $
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.freebsd,v 1.228 2008/03/08 03:54:30 lippe Exp $
*/
#ifndef _calendar_freebsd_
@@ -190,6 +190,7 @@
07/28 Jim Mock <jim at FreeBSD.org> born in Bethlehem, Pennsylvania, United States, 1974
07/28 Tom Hukins <tom at FreeBSD.org> born in Manchester, United Kingdom, 1976
07/29 Dirk Meyer <dinoex at FreeBSD.org> born in Kassel, Hessen, Germany, 1965
+07/29 Felippe M. Motta <lippe at FreeBSD.org> born in Maceio, Alagoas, Brazil, 1988
08/02 Gabor Kovesdan <gabor at FreeBSD.org> born in Budapest, Hungary, 1987
08/05 Alfred Perlstein <alfred at FreeBSD.org> born in Brooklyn, New York, United States, 1978
08/06 Anton Berezin <tobez at FreeBSD.org> born in Dnepropetrovsk, Ukraine, 1970
More information about the p4-projects
mailing list