Re: updated patch for tirpc on GNU/kFreeBSD
tags 610716 pending thanks 2011/6/7 Petr Salinger petr.salin...@seznam.cz: tags 610716 +patch -- Attached please find proposed patch against 0.2.2-2. I've uploaded an NMU to DELAYED/15 with Petr's patch. Steinar, please consider uploading earlier if you have time to review it. -- Robert Millan -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/banlktimhokayv9vkkyczacewhy4awh1...@mail.gmail.com
Bug#601803: patch for wireless support
tags 601803 patch
unblock 601803 by 629521
thanks
Here's a patch to enable wireless support.
As for libjail it's not really necessary; the Makefile layout
is confusing which lead Timo to think it was.
libjail is used for ifconfig vnet (see manpage) feature
which has nothing to do with wireless support.
Guillem, do you think either of the header kludges I'm
adding with this patch would be suitable for libbsd?
--
Robert Millan
diff -Nur a/freebsd-utils-8.2/debian/control b/freebsd-utils-8.2/debian/control
--- a/freebsd-utils-8.2/debian/control 2011-05-30 22:33:26.0 +0200
+++ b/freebsd-utils-8.2/debian/control 2011-06-08 13:19:35.632254657 +0200
@@ -26,7 +26,9 @@
# libcam-dev: camcontrol
libcam-dev (= 8.2),
# libedit-dev: pppctl
- libedit-dev
+ libedit-dev,
+# libexpat1-dev: ifconfig
+ libexpat1-dev,
Vcs-Browser: http://svn.debian.org/wsvn/glibc-bsd/trunk/freebsd-utils/
Vcs-Svn: svn://svn.debian.org/glibc-bsd/trunk/freebsd-utils/
Standards-Version: 3.9.2
diff -Nur a/freebsd-utils-8.2/debian/local/include/bsdxml.h
b/freebsd-utils-8.2/debian/local/include/bsdxml.h
--- a/freebsd-utils-8.2/debian/local/include/bsdxml.h 1970-01-01
01:00:00.0 +0100
+++ b/freebsd-utils-8.2/debian/local/include/bsdxml.h 2011-06-08
13:19:35.633352283 +0200
@@ -0,0 +1 @@
+#include expat.h
diff -Nur a/freebsd-utils-8.2/debian/local/include/sys/cdefs.h
b/freebsd-utils-8.2/debian/local/include/sys/cdefs.h
--- a/freebsd-utils-8.2/debian/local/include/sys/cdefs.h1970-01-01
01:00:00.0 +0100
+++ b/freebsd-utils-8.2/debian/local/include/sys/cdefs.h2011-06-08
13:19:35.635216207 +0200
@@ -0,0 +1,3 @@
+#include_next sys/cdefs.h
+#include stdint.h
+#define __DECONST(type, var) ((type) var)
diff -Nur a/freebsd-utils-8.2/debian/patches/032_wireless.diff
b/freebsd-utils-8.2/debian/patches/032_wireless.diff
--- a/freebsd-utils-8.2/debian/patches/032_wireless.diff1970-01-01
01:00:00.0 +0100
+++ b/freebsd-utils-8.2/debian/patches/032_wireless.diff2011-06-08
13:18:32.259527397 +0200
@@ -0,0 +1,14 @@
+--- a/sbin/ifconfig/Makefile
b/sbin/ifconfig/Makefile
+@@ -27,9 +27,10 @@
+ #SRCS+= ifgre.c # GRE keys etc
+ SRCS+=ifgif.c # GIF reversed header workaround
+
+-#SRCS+= ifieee80211.c regdomain.c # SIOC[GS]IEEE80211 support
++SRCS+=ifieee80211.c regdomain.c # SIOC[GS]IEEE80211 support
+ #DPADD+= ${LIBBSDXML} ${LIBSBUF} ${LIBJAIL}
+ #LDADD+= -lbsdxml -ljail -lsbuf
++LDADD+= -lexpat -lsbuf
+
+ #SRCS+= ifcarp.c# SIOC[GS]VH support
+ #SRCS+= ifgroup.c # ...
diff -Nur a/freebsd-utils-8.2/debian/patches/series
b/freebsd-utils-8.2/debian/patches/series
--- a/freebsd-utils-8.2/debian/patches/series 2011-05-30 22:40:51.0
+0200
+++ b/freebsd-utils-8.2/debian/patches/series 2011-06-08 13:19:08.119469653
+0200
@@ -28,3 +28,4 @@
029_arp.diff
030_arp_libbsd.diff
031_savecore.diff
+032_wireless.diff
diff -Nur a/freebsd-utils-8.2/debian/rules b/freebsd-utils-8.2/debian/rules
--- a/freebsd-utils-8.2/debian/rules2011-05-30 22:33:26.0 +0200
+++ b/freebsd-utils-8.2/debian/rules2011-06-08 13:19:35.636624766 +0200
@@ -5,8 +5,8 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-CFLAGS = -Wall -g -pipe -fPIC -I. -D_GNU_SOURCE -D'__FBSDID(string)='
-CXXFLAGS = -Wall -g -pipe -fPIC -I. -D_GNU_SOURCE -D'__FBSDID(string)='
+CFLAGS = -Wall -g -pipe -fPIC -I. -D_GNU_SOURCE -D'__FBSDID(string)='
-D__va_list=__builtin_va_list
+CXXFLAGS = -Wall -g -pipe -fPIC -I. -D_GNU_SOURCE -D'__FBSDID(string)='
-D__va_list=__builtin_va_list
ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
Bug#629521: libjail1-udeb
libjail1-udeb might not be necessary. I only added it because I thought it was a requirement for ifconfig. See #601803. -- Robert Millan -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/banlktinr2a9ctuijs5mgej3snjmmhn9...@mail.gmail.com
Processed: patch for wireless support
Processing commands for cont...@bugs.debian.org: tags 601803 patch Bug #601803 [freebsd-utils] not compiled with ieee80211 (WLAN) support Added tag(s) patch. unblock 601803 by 629521 Bug #601803 [freebsd-utils] not compiled with ieee80211 (WLAN) support Was blocked by: 629521 Removed blocking bug(s) of 601803: 629521 thanks Stopping processing here. Please contact me if you need assistance. -- 601803: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=601803 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/handler.s.c.130753232228722.transcr...@bugs.debian.org
Re: updated patch for tirpc on GNU/kFreeBSD
On Wed, Jun 08, 2011 at 12:57:45PM +0200, Robert Millan wrote: I've uploaded an NMU to DELAYED/15 with Petr's patch. Steinar, please consider uploading earlier if you have time to review it. I'm fine with NMU, although I haven't looked at the patch. /* Steinar */ -- Homepage: http://www.sesse.net/ -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20110608111321.ga19...@uio.no
Re: Different behavior in the chroot and build services
Hello, Le mardi 31 mai 2011 à 15:33 +0200, Petr Salinger a écrit : Anyway, the difference between buildd and porter machine is also CPU. On one my machine (and seems also on both GNU/kFreeBSD builld) make getarch_2nd fails. The param.h handles OPTERON, but not INTEL_UNKNOWN as generated by getarch 1: Thanks for spotting that. I think it is the issue. Could you share the output of /proc/cpuinfo ? I would like to report a bug upstream on this (looks like it does not fall-back on the generic define if it cannot detect the CPU). Since I have no way to reproduce myself the issue, would you mind to test some stuff for me ? 1) Just apply displayCpuInfo.diff (forceGeneric.diff should not be applied here) and type make getarch 2) Apply forceGeneric.diff it should fix the report issue. If you don't have time for that, no worries. many thanks, Sylvestre -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/1307543129.10829.37.ca...@losinj.inria.fr
Bug#601803: patch for wireless support
Hi! On Wed, 2011-06-08 at 13:25:10 +0200, Robert Millan wrote: As for libjail it's not really necessary; the Makefile layout is confusing which lead Timo to think it was. Ah perfect will include this for the next upload, then. libjail is used for ifconfig vnet (see manpage) feature which has nothing to do with wireless support. We can enable it later on when we've added libjail to freebsd-libs and it's gotten through NEW. Guillem, do you think either of the header kludges I'm adding with this patch would be suitable for libbsd? The __DECONST one was already on my list of things to add, as I've seen it used somewhere recently. For the second one, if you mean __va_list, then yes I've also had that pending. Otherwise if you mean bsdxml.h (but you mentioned the expat maintainers were going to provide that?) then I don't think it would be a good idea as libbsd would need to pull libexpat-dev, which I'd rather not. thanks, guillem -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20110609035512.ga30...@gaara.hadrons.org
Testing new getpt(3) and posix_openpt(3) implementation
Hi!
I just got annoyed enough with the kFreeBSD message on the console:
pid %d (%s) is using legacy pty devices%s\n
that I started digging around. This is due to applications using the
old BSD-style pseudo-terminal master device.
I've switched the eglibc getpt(3) and posix_openpt(3) to use the new
posix_openpt(2) syscall introduced in kFreeBSD 8.0. I've done this
instead of using the compatibility ‘/dev/ptmx’ device, because it
should allow us to unload the compatibility pty(4) kernel module.
I've not build or run tested the code, so if someone with an eglibc
build-tree around could test the attached patch (against the
glibc-ports tree) that would be pretty helpful, otherwise I might try
to, once I've got some spare time.
thanks,
guillem
Index: kfreebsd/getpt.c
===
--- kfreebsd/getpt.c (revision 3428)
+++ kfreebsd/getpt.c (working copy)
@@ -21,63 +21,27 @@
#include string.h
#include unistd.h
#include sys/ioctl.h
+#include sysdep.h
+/* The system call does not change the controlling terminal, so we have
+ * to do it ourselves. */
+extern int __syscall_posix_openpt (int oflag);
+libc_hidden_proto (__syscall_posix_openpt)
-/* Prefix for master pseudo terminal nodes. */
-#define _PATH_PTY /dev/pty
+/* Prototype for function that opens BSD-style master pseudo-terminals. */
+int __bsd_getpt (void);
-
-/* Letters indicating a series of pseudo terminals. */
-#ifndef PTYNAME1
-#define PTYNAME1 pqrs
-#endif
-const char __libc_ptyname1[] attribute_hidden = PTYNAME1;
-
-/* Letters indicating the position within a series. */
-#ifndef PTYNAME2
-#define PTYNAME2 0123456789abcdefghijklmnopqrstuv;
-#endif
-const char __libc_ptyname2[] attribute_hidden = PTYNAME2;
-
-
/* Open a master pseudo terminal and return its file descriptor. */
int
__posix_openpt (int oflag)
{
- char buf[sizeof (_PATH_PTY) + 2];
- const char *p, *q;
- char *s;
-
- s = __mempcpy (buf, _PATH_PTY, sizeof (_PATH_PTY) - 1);
- /* s[0] and s[1] will be filled in the loop. */
- s[2] = '\0';
-
- for (p = __libc_ptyname1; *p != '\0'; ++p)
+ int fd = INLINE_SYSCALL (posix_openpt, 1, oflag);
+ if (fd = 0)
{
- s[0] = *p;
-
- for (q = __libc_ptyname2; *q != '\0'; ++q)
- {
- int fd;
-
- s[1] = *q;
-
- fd = __open (buf, oflag);
- if (fd = 0)
- {
- if (!(oflag O_NOCTTY))
- __ioctl (fd, TIOCSCTTY, NULL);
-
- return fd;
- }
-
- if (errno == ENOENT)
- return -1;
- }
+ if (!(oflag O_NOCTTY))
+__ioctl (fd, TIOCSCTTY, NULL);
}
-
- __set_errno (ENOENT);
- return -1;
+ return fd;
}
weak_alias (__posix_openpt, posix_openpt)
@@ -86,7 +50,25 @@
int
__getpt (void)
{
- return __posix_openpt (O_RDWR);
+ int fd = __posix_openpt (O_RDWR);
+ if (fd == -1)
+{
+ fd = __bsd_getpt ();
+ if (fd = 0)
+{
+ if (!(oflag O_NOCTTY))
+__ioctl (fd, TIOCSCTTY, NULL);
+}
+}
+ return fd;
}
-weak_alias (__getpt, getpt)
+
+/* Letters indicating a series of pseudo terminals. */
+#define PTYNAME1 pqrs;
+/* Letters indicating the position within a series. */
+#define PTYNAME2 0123456789abcdefghijklmnopqrstuv;
+
+#define __getpt __bsd_getpt
+#define HAVE_POSIX_OPENPT
+#include sysdeps/unix/bsd/getpt.c
Index: kfreebsd/syscalls.list
===
--- kfreebsd/syscalls.list (revision 3428)
+++ kfreebsd/syscalls.list (working copy)
@@ -98,6 +98,7 @@
ntp_adjtime - ntp_adjtime i:p ntp_adjtime
obreak - obreak i:a __syscall_obreak
sys_open - open i:siv __syscall_open
+posix_openpt getpt posix_openpt i:i __syscall_posix_openpt
poll - poll Ci:pii __poll poll
sys_pread - pread i:ibni __syscall_pread
sys_freebsd6_pread - freebsd6_pread i:ibnii __syscall_freebsd6_pread
Index: kfreebsd/Versions
===
--- kfreebsd/Versions (revision 3428)
+++ kfreebsd/Versions (working copy)
@@ -112,6 +112,7 @@
# misc fixes for FreeBSD:
__syscall_freebsd6_lseek; __syscall_freebsd6_pread; __syscall_freebsd6_pwrite;
__syscall_lseek; __syscall_pread; __syscall_pwrite;
+__syscall_posix_openpt;
__syscall_connect; __syscall_sendto;
__syscall_cpuset_getaffinity ; __syscall_cpuset_setaffinity;
# global variable used in brk()
Re: Different behavior in the chroot and build services
Hi. There have been no attachements. Thanks for spotting that. I think it is the issue. Could you share the output of /proc/cpuinfo ? $ cat /proc/cpuinfo processor : 0 vendor_id : GenuineIntel cpu family : 6 model : 7 model name : QEMU Virtual CPU version 0.12.5 stepping: 3 flags : fpu de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 b19 mmx fxsr xmm sse2 cpu MHz : 2667.06 bogomips: 2667.06 The real one is Core2 Duo E6750, the kfreebsd-i386 runs inside kvm. Since I have no way to reproduce myself the issue, would you mind to test some stuff for me ? Well, I think you eventually could via qemu/kvm. And the # cpuid: eax ineax ebx ecx edx 0004 756e6547 6c65746e 49656e69 0001 0623 0800 80002001 078bfbfd 0002 0001 002c307d 0003 0004 0003 8000 800a 68747541 444d4163 69746e65 8001 0623 0001 2181abfd 8002 554d4551 72695620 6c617574 55504320 8003 72657620 6e6f6973 312e3020 00352e32 8004 8005 01ff01ff 01ff01ff 40020140 40020140 8006 42004200 02008140 8007 8008 3028 8009 800a 0001 0010 Vendor ID: GenuineIntel; CPUID level 4 Intel-specific functions: Version 0623: Type 0 - Original OEM Family 6 - Pentium Pro Model 2 - Stepping 3 Reserved 0 Extended brand string: QEMU Virtual CPU version 0.12.5 CLFLUSH instruction cache line size: 8 Feature flags 078bfbfd: FPUFloating Point Unit DE Debugging Extensions PSEPage Size Extensions TSCTime Stamp Counter MSRModel Specific Registers PAEPhysical Address Extension MCEMachine Check Exception CX8COMPXCHG8B Instruction APIC On-chip Advanced Programmable Interrupt Controller present and enabled SEPFast System Call MTRR Memory Type Range Registers PGEPTE Global Flag MCAMachine Check Architecture CMOV Conditional Move and Compare Instructions FGPAT Page Attribute Table PSE-36 36-bit Page Size Extension CLFSH CFLUSH instruction MMXMMX instruction set FXSR Fast FP/MMX Streaming SIMD Extensions save/restore SSEStreaming SIMD Extensions instruction set SSE2 SSE2 extensions TLB and cache info: 7d: unknown TLB/cache descriptor 30: unknown TLB/cache descriptor 2c: unknown TLB/cache descriptor Processor serial: -0623---- Petr -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/alpine.lrh.2.02.1106090719490.21...@sci.felk.cvut.cz
