Date: Sat, 25 Feb 2006 23:01:28 +0100 From: Alexander Leidinger <Alexander@Leidinger.net> To: Kris Kennaway <kris@obsecurity.org> Cc: freebsd-emulation@freebsd.org Subject: Re: [kris@FreeBSD.org: cvs commit: ports/emulators/rtc Makefile] Message-ID: <20060225230128.2764ed73@Magellan.Leidinger.net> In-Reply-To: <20060225211045.GR15500@xor.obsecurity.org> References: <20060225211045.GR15500@xor.obsecurity.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--MP_T+Mg7A_ReoA8+u_k4jVIkEz Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline Am Sat, 25 Feb 2006 16:10:45 -0500 schrieb Kris Kennaway <kris@obsecurity.org>: > FYI; see http://pointyhat.freebsd.org and/or previous email > notifications for the full log. > > Thanks, > Kris > > P.S. Since we are currently in ports freeze for the 5.5 and 6.1 > release cycles, your swift attention to this problem is requested. I didn't looked at the pointyhat logs, but I think the problem is the remaining linker.hints file at deinstall time. I solved this with a kldxref (PREFIX/modules is now removed). While I'm here fix the port a little bit to be more package friendly. Bye, Alexander. -- I believe the technical term is "Oops!" http://www.Leidinger.net Alexander @ Leidinger.net GPG fingerprint = C518 BC70 E67F 143F BE91 3365 79E2 9C60 B006 3FE7 WL http://www.amazon.de/exec/obidos/registry/1FZ4DTHQE9PQ8/ref=wl_em_to/ --MP_T+Mg7A_ReoA8+u_k4jVIkEz Content-Type: text/x-patch; name=rtc.diff Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=rtc.diff Index: Makefile =================================================================== RCS file: /big/FreeBSD-CVS/ports/emulators/rtc/Makefile,v retrieving revision 1.30 diff -u -u -r1.30 Makefile --- Makefile 20 Feb 2006 01:44:59 -0000 1.30 +++ Makefile 25 Feb 2006 22:00:43 -0000 @@ -7,7 +7,7 @@ PORTNAME= rtc PORTVERSION= 2004.02.24.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= emulators linux MASTER_SITES= # none DISTFILES= # none @@ -15,8 +15,6 @@ MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= Kernel module which provides /dev/rtc device support -BROKEN= Incomplete pkg-plist - WRKSRC= ${WRKDIR}/files NO_FETCH= yes @@ -29,7 +27,8 @@ STARTUP= rtc.sh MAKE_ARGS= KMODDIR="${KMODDIR}" CDEV_MAJOR="${CDEV_MAJOR}" -PLIST_SUB= DEVDIR="${DEVDIR}" CDEV_MAJOR="${CDEV_MAJOR}" RTC_H_DIR="${RTC_H_DIR}" +PLIST_SUB= DEVDIR="${DEVDIR}" CDEV_MAJOR="${CDEV_MAJOR}" \ + RTC_H_DIR="${RTC_H_DIR}" SRC_BASE?= /usr/src @@ -39,6 +38,12 @@ IGNORE= needs a system more recent than 400013 .endif +.if ${OSVERSION} < 500104 +PLIST_SUB+= MAKEDEV="" +.else +PLIST_SUB+= MAKEDEV="@comment " +.endif + .if !exists(${SRC_BASE}/sys/Makefile) IGNORE= needs kernel source files .endif @@ -53,8 +58,6 @@ ${MKDIR} ${KMODDIR} post-install: - ${RM} -f ${DEVDIR}/rtc - -mknod /dev/rtc c ${CDEV_MAJOR} 0 ${INSTALL_DATA} ${WRKSRC}/rtc.h ${PREFIX}/include/ ${MKDIR} ${PREFIX}/share/examples/rtc ${INSTALL_DATA} ${WRKSRC}/test.c ${PREFIX}/share/examples/rtc/ Index: pkg-plist =================================================================== RCS file: /big/FreeBSD-CVS/ports/emulators/rtc/pkg-plist,v retrieving revision 1.6 diff -u -u -r1.6 pkg-plist --- pkg-plist 22 Jan 2006 01:50:37 -0000 1.6 +++ pkg-plist 25 Feb 2006 21:53:44 -0000 @@ -2,6 +2,10 @@ include/rtc.h modules/rtc.ko %%EXAMPLESDIR%%/test.c +%%MAKEDEV%%@exec mknod /dev/rtc c %%CDEV_MAJOR%% 0 +@exec rm -f %%DEVDIR%%/rtc +@exec /usr/sbin/kldxref %D/modules +@unexec /usr/sbin/kldxref %D/modules @dirrm %%EXAMPLESDIR%% @dirrmtry modules @unexec rm -f /dev/rtc --MP_T+Mg7A_ReoA8+u_k4jVIkEz--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060225230128.2764ed73>