Bug#689916: kfreebsd-10: enable DTrace options as upstream
Source: kfreebsd-10 Version: 10.0~svn238475-3 Severity: wishlist X-Debbugs-CC: debian-bsd@lists.debian.org Please enable DTrace support by default in kfreebsd-10, as done upstream. Currently the kfreebsd-10 package disables DTrace support. See: http://anonscm.debian.org/viewvc/glibc-bsd/trunk/kfreebsd-10/debian/patches/999_config.diff?revision=4344&view=markup Upstream enabled DTrace support by default. See: http://svnweb.freebsd.org/base?view=revision&revision=234504 Regards Luca -- 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/cactd9n47zzcghcecrgrpbqcvyxaxmttpnmgqdimhmjkp98w...@mail.gmail.com
Bug#689918: DTrace support: Port ctfconvert and ctfmerge
Source: freebsd-buildutils Version: 9.0-11 Severity: wishlist X-Debbugs-CC: debian-bsd@lists.debian.org Please port tools ctfconvert and ctfmerge from upstream for DTrace support. References: http://www.freebsd.org/doc/handbook/dtrace-implementation.html http://dtrace.org/blogs/rm/2010/10/29/trying-to-use-dtrace-in-debiankfreebsd/ Regards Luca -- 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/cactd9n7aop8rfcavv01ponv_4ahhb6fakuwakdoihnqckm+...@mail.gmail.com
[patch] Blender on Debian GNU/KFreeBSD
(I CCed the blender package mantainer. I hope it is not a mistake.) I am on Debian GNU/KFreeBSD i386. This is the output of "uname -a": GNU/kFreeBSD debian 7.1-1-686-smp #0 Thu Sep 4 18:55:28 CEST 2008 i686 i386 Intel(R) Pentium(R) Dual CPU T2330 @ 1.60GHz GNU/kFreeBSD I am trying to learn Blender Game Engine following the tutorial at [BGE tutoria]. I installed the version of Blender in Debian repositories. The Blender package in Debian GNU/KFreeBSD is out of sync with the GNU/Linux version, as showed at [Blender Debian unstable] (2.45 vs. 2.46). Starting the Game Engine (pressing P) crashes the version of Blender in Debian GNU/KFreeBSD; instead it doesn't crash that in Debian GNU/Linux (I tried it on a Debian GNU/Linux x86 32 bit computer). I decided to try to sync the Blender package on Debian GNU/KFreeBSD with the version in Debian GNU/Linux. I managed to reproduce the build log at [2.46 buildd kfreebsd-i386], using "apt-get --build source blender". I report here the interesting part. Configuring library bf_string Unknown window system specified. # Build plugins by hand ln -sf ../../../source/blender/blenpluginapi \ install/linux2/plugins/include ln: creating symbolic link `install/linux2/plugins/include': No such file or directory make: *** [build-stamp] Error 1 dpkg-buildpackage: failure: debian/rules build gave error exit status 2 ** Build finished at 20080905-0940 FAILED [dpkg-buildpackage died] The problem was that the GNU/KFreeBSD support patch had been disabled because needing updating, as you can read from [Blender package changelog]. I report here the interesting part. * debian/patches/10_gnukfreebsd_support: - Disable it, needs update. I updated the patch. The reason of the build failure was this (as you can read from [Blender package changelog]). I report here the interesting part. * Use the system-wide FTGL library instead of the embedded one But the compilation fails almost at the end, and I don't understand why... Here is the last part of the build log: Linking program ==> 'blender' build/linux2/lib/libblender_creator.a(creator.o): In function `main': /home/user/debian/blender-2.46+dfsg/source/creator/creator.c:281: undefined reference to `zLhm65070058860608_br_init' collect2: ld returned 1 exit status scons: *** [build/linux2/bin/blender] Error 1 scons: building terminated because of errors. make: *** [build-stamp] Error 2 dpkg-buildpackage: failure: debian/rules build gave error exit status 2 Build command 'cd blender-2.46+dfsg && dpkg-buildpackage -b -uc' failed. Can you please try to sync the package of Blender in Debian GNU/KFreeBSD with that in Debian GNU/Linux? I describe here what I modified to advance from the configuration error to the compilation error (I am referring to Blender package 2.46+dfsg-4). 1) apply this diff to debian/patches/series ###START DIFF 1d0 < #10_gnukfreebsd_support 2a2 > 06_gnukfreebsd_support ###END DIFF 2) rename debian/patches/10_gnukfreebsd_support to debian/patches/06_gnukfreebsd_support and apply to it this diff ###START DIFF 3c3 < @@ -185,7 +185,7 @@ --- > @@ -203,7 +203,7 @@ 89,99d88 < --- a/extern/bFTGL/src/FTVectoriser.cpp 2007-09-18 06:59:15.0 +0200 < +++ b/extern/bFTGL/src/FTVectoriser.cpp 2007-11-25 18:08:28.0 +0100 < @@ -7,7 +7,7 @@ < < #ifdef __APPLE_CC__ < typedef GLvoid (*GLUTesselatorFunction)(...); < -#elif defined( __mips ) || defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined( __sun ) || defined (__CYGWIN__) < +#elif defined( __mips ) || defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined( __sun ) || defined (__CYGWIN__) || defined (__FreeBSD_kernel__) < typedef GLvoid (*GLUTesselatorFunction)(); < #elif defined ( WIN32) < typedef GLvoid (CALLBACK *GLUTesselatorFunction)( ); 102c91 < @@ -54,7 +54,7 @@ --- > @@ -53,7 +53,7 @@ 113c102 < @@ -58,7 +58,7 @@ --- > @@ -55,7 +55,7 @@ ###END DIFF Thanks for your work in Debian GNU/KFreeBSD and in the Blender package. [BGE tutoria] http://wiki.blender.org/index.php/BSoD/Introduction_to_the_Game_Engine/The_basics_of_the_Blender_GE [Blender Debian unstable] http://packages.debian.org/search?keywords=blender&searchon=names&suite=unstable§ion=all [2.46 buildd kfreebsd-i386] http://buildd.debian-ports.org/fetch.php?pkg=blender&arch=kfreebsd-i386&ver=2.46%2Bdfsg-4&stamp=1220600361&file=log&as=raw [Blender package changelog] http://packages.debian.org/changelogs/pool/main/b/blender/current/changelog -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
Re: [patch] Blender on Debian GNU/KFreeBSD
2008/10/6 Cyril Brulebois <[EMAIL PROTECTED]>: [...] >> Can you please try to sync the package of Blender in Debian >> GNU/KFreeBSD with that in Debian GNU/Linux? > > I'm currently waiting for 2.48 to be released (due since some days), and > I'll package it for experimental, including an updated GNU/kFreeBSD > patch. Great! >> I describe here what I modified to advance from the configuration >> error to the compilation error (I am referring to Blender package >> 2.46+dfsg-4). > > Thank you for that. > > BTW, usually one uses "diff -u" which provides with an even nicer > output. ;-) Sorry. I now attouch the diffs created using "diff -u" (from inside "debian/patches/" path). Thanks. Luca Favatella --- series.bak 2008-10-06 18:21:56.0 +0200 +++ series 2008-10-06 18:05:01.0 +0200 @@ -1,5 +1,5 @@ -#10_gnukfreebsd_support 02_tmp_in_HOME +06_gnukfreebsd_support 10_use_systemwide_ftgl 20_fix_ftbfs_with_latest_ftgl 30_gameengine_libgl_location_fix --- 10_gnukfreebsd_support.bak 2008-10-06 18:21:56.0 +0200 +++ 06_gnukfreebsd_support 2008-10-06 18:10:46.0 +0200 @@ -1,6 +1,6 @@ --- a/SConstruct 2007-09-18 06:59:24.0 +0200 +++ b/SConstruct 2007-11-25 18:08:28.0 +0100 -@@ -185,7 +185,7 @@ +@@ -203,7 +203,7 @@ # see if this linux distro has libalut @@ -86,20 +86,9 @@ cflags='-pthread' env.BlenderLib ( libname = 'blender_render', sources = sources, includes = Split(incs), defines=defs, libtype='core', priority=45, compileflags=cflags ) a/extern/bFTGL/src/FTVectoriser.cpp 2007-09-18 06:59:15.0 +0200 -+++ b/extern/bFTGL/src/FTVectoriser.cpp 2007-11-25 18:08:28.0 +0100 -@@ -7,7 +7,7 @@ - - #ifdef __APPLE_CC__ - typedef GLvoid (*GLUTesselatorFunction)(...); --#elif defined( __mips ) || defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined( __sun ) || defined (__CYGWIN__) -+#elif defined( __mips ) || defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined( __sun ) || defined (__CYGWIN__) || defined (__FreeBSD_kernel__) - typedef GLvoid (*GLUTesselatorFunction)(); - #elif defined ( WIN32) - typedef GLvoid (CALLBACK *GLUTesselatorFunction)( ); --- a/source/blender/blenlib/intern/storage.c 2007-09-18 06:58:46.0 +0200 +++ b/source/blender/blenlib/intern/storage.c 2007-11-25 18:08:28.0 +0100 -@@ -54,7 +54,7 @@ +@@ -53,7 +53,7 @@ #include #endif @@ -110,7 +99,7 @@ #endif --- a/release/plugins/bmake 2007-09-18 06:57:33.0 +0200 +++ b/release/plugins/bmake 2007-11-25 18:08:28.0 +0100 -@@ -58,7 +58,7 @@ +@@ -55,7 +55,7 @@ LD="ld"; LDFLAGS="-Bshareable";
request for enabling the "ae" driver for kernel 7.1
Hi. I saw at [debian_svn] that in Debian svn you are targeting releng_7_1. I saw that the "ae" driver is not enabled for releng_7_1 ([releng_7_1_conf]), but it is enabled for head ([head_conf]). The "ae" driver is useful to provide LAN to Asus Eee PC 900, as described at [freebsd_wiki]. Could you please consider enablig the "ae" driver in the next build of the FreeBSD 7.1 kernel? If you can't enable it, can you please suggest me the easier way to compile the "ae" driver on Debian GNU/KfreeBSD? Thanks. Luca Favatella [debian_svn] http://svn.debian.org/wsvn/glibc-bsd/trunk/kfreebsd-7/fetch?op=diff&rev=0&sc=0 [releng_7_1_conf] http://svn.freebsd.org/viewvc/base/releng/7.1/sys/dev/ae/if_ae.c?view=log [head_conf] http://svn.freebsd.org/viewvc/base/head/sys/i386/conf/GENERIC?revision=185281&view=markup [freebsd_wiki] http://wiki.freebsd.org/AsusEee#head-6d00dcb960b731976447f2511654a0419ce7cc0f -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
Re: request for enabling the "ae" driver for kernel 7.1
[sorry for the double email, I forgot to cc the list] On 28/11/2008, Petr Salinger <[EMAIL PROTECTED]> wrote: > Hi. > >> Could you please consider enablig the "ae" driver in the next build of >> the FreeBSD 7.1 kernel? >> >> If you can't enable it, can you please suggest me the easier way to >> compile the "ae" driver on Debian GNU/KfreeBSD? > > It is (will be) not available as built-in, but is is (will be) available > as a module. The "modprobe if_ae" should suffice. > Great news. Thanks. > Do you need amd64 or i686 flavour ? > > Petr > i686. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
kfreebsd svn build
Hi. I'm trying to build the svn version of KFreeBSD. I checked it out using: svn co svn://svn.debian.org/glibc-bsd/trunk/kfreebsd-7/ I tried to build it using "dpkg-buildpackage". I got: dpkg-buildpackage: set CFLAGS to default value: -g -O2 dpkg-buildpackage: set CPPFLAGS to default value: dpkg-buildpackage: set LDFLAGS to default value: dpkg-buildpackage: set FFLAGS to default value: -g -O2 dpkg-buildpackage: set CXXFLAGS to default value: -g -O2 dpkg-buildpackage: source package kfreebsd-7 dpkg-buildpackage: source version 7.1~cvs20081125-1 dpkg-buildpackage: source changed by Aurelien Jarno dpkg-buildpackage: host architecture kfreebsd-i386 dpkg-checkbuilddeps: failure: cannot read debian/control: No such file or directory dpkg-buildpackage: warning: Build dependencies/conflicts unsatisfied; aborting. dpkg-buildpackage: warning: (Use -d flag to override.) I tried using "dpkg-buildpackage -d", but I got: dpkg-buildpackage: set CFLAGS to default value: -g -O2 dpkg-buildpackage: set CPPFLAGS to default value: dpkg-buildpackage: set LDFLAGS to default value: dpkg-buildpackage: set FFLAGS to default value: -g -O2 dpkg-buildpackage: set CXXFLAGS to default value: -g -O2 dpkg-buildpackage: source package kfreebsd-7 dpkg-buildpackage: source version 7.1~cvs20081125-1 dpkg-buildpackage: source changed by Aurelien Jarno dpkg-buildpackage: host architecture kfreebsd-i386 fakeroot debian/rules clean dh_testdir dh_testdir: cannot read debian/control: No such file or directory make: *** [clean] Error 1 dpkg-buildpackage: failure: fakeroot debian/rules clean gave error exit status 2 The problem seems to be that there is no debian/control file. I understood that it is generated from debian/control.in. I also tried svn-buildpackage without success. Can you please help me building it? Cheers, Luca Favatella -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
]Re: kfreebsd svn build
On 22/12/2008, Cyril Brulebois wrote: >> The problem seems to be that there is no debian/control file. I >> understood that it is generated from debian/control.in. > > From a quick look at debian/rules, try: "make -f debian/rules control". I had already tried this, without success, but I tried it again and it worked now (I don't know why...). I am writing here how I managed to build kfreebsd from svn. -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Re: kfreebsd svn build
(sorry for the previous email, I made a mistake while preparing it) On 22/12/2008, Cyril Brulebois wrote: > Luca Favatella (22/12/2008): >> The problem seems to be that there is no debian/control file. I >> understood that it is generated from debian/control.in. > > From a quick look at debian/rules, try: "make -f debian/rules control". Thanks for you reply. I had already tried this, without success, but now I tried it again and it works. Doing these steps seems to work: 1) svn co svn://svn.debian.org/glibc-bsd/trunk/kfreebsd-7/ 2) cd kfreebsd-7/ 3) modify line 33 of debian/rules from "control: clean" to "control:" 4) make -f debian/rules control 5) chmod +x debian/rules 6) sh fetch 7) dpkg-buildpackage Thanks, Luca Favatella -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
debian-installer status
Hi. Can you please tell me the status of debian-installer on Debian GNU/kFreeBSD? I tried to follow this guide [build]. It works on Debian GNU/Linux x86 32 bit. On Debian GNU/kFreeBSD x86 32 bit it doesn't seem to work. At the last step, typing "fakeroot make build_netboot" I get nothing; typing "fakeroot make all_build", I get "make[3]: `flavour_build' is up to date.". Can you please suggest me how I can help porting the d-i on GNU/kFreeBSD? Is the list at [things needed] outdated? Can you please suggest me a simple task to complete (i.e. porting a simple dependency of d-i to GNU/kFreeBSD)? Cheers, Luca Favatella [build] http://wiki.debian.org/DebianInstaller/Build [things needed] http://wiki.debian.org/Debian_GNU/kFreeBSD/Debian-Installer -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
[patch] wine and jack-audio-connection-kit build problem
Hi. Wine doesn't build on Debian GNU/KFreeBSD [wine buildd]. The problem (at the moment) is that jack-audio-connection-kit doesn't build [jack buildd]. Here are the interesting lines of the [jack buildd]: net_driver.c: In function 'net_driver_write': net_driver.c:499: error: 'MSG_CONFIRM' undeclared (first use in this function) Here are the interesting lines of net_driver.c (from [debian git jack]): 496 #ifdef __APPLE__ 497 static const int flag = 0; 498 #else 499 static const int flag = MSG_CONFIRM; 500 #endif jackaudio upstream says it supports FreeBSD [jack homepage], but in these lines of net_driver.c it seems FreeBSD in not considered. In fact MSG_CONFIRM is linux specific [linux send(2) man page]. FreeBSD has not this problem because they use a previous version [freebsd jack port], without this netjack feature [jack 0.115.6 release notes]. I propose a patch against the jack-audio-connection-kit package (suggested by [debian porting]). I think changing #ifdef __APPLE__ to #if defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) should solve the problem. I think this patch (or similar) should be pushed upstream because it is useful also for FreeBSD (when they'll update their port). Can you please consider applying this patch? Thanks, Luca Favatella [wine buildd] http://buildd.debian-ports.org/fetch.php?&pkg=wine&ver=1.1.9-1&arch=kfreebsd-i386&stamp=1231073161&file=log&as=raw [jack buildd] http://buildd.debian-ports.org/fetch.php?pkg=jack-audio-connection-kit&arch=kfreebsd-i386&ver=0.116.1-2&stamp=1230335159&file=log&as=raw [debian git jack] http://git.debian.org/?p=pkg-multimedia/jack-audio-connection-kit.git;a=blob;f=drivers/netjack/net_driver.c [jack homepage] http://jackaudio.org/ [linux send(2) man page] http://www.kernel.org/doc/man-pages/online/pages/man2/sendmsg.2.html [freebsd jack port] http://www.freebsd.org/cgi/cvsweb.cgi/ports/audio/jack/ [jack 0.115.6 release notes] http://jackaudio.org/node/19 [debian porting] http://glibc-bsd.alioth.debian.org/porting/PORTING -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Re: [patch] wine and jack-audio-connection-kit build problem
On 06/01/2009, Petr Salinger wrote: > In fact, alternate patch for jack-audio-connection-kit > is since Mon, 29 Dec 2008 in #510127, > http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=510127 I didn't see it, it is my fault, sorry for the noise. > The list of submitted entries should be available at > > http://bugs.debian.org/cgi-bin/pkgreport.cgi?tag=kfreebsd;users=glibc-bsd-de...@lists.alioth.debian.org;pri0=pending:pending,forwarded,pending-fixed,fixed,done,absent;ttl0=Outstanding,Forwarded,Pending%20Upload,Fixed%20in%20NMU,Resolved;pri1=pending%3dpending%2btag%3dwontfix,pending%3dpending%2btag%3dmoreinfo,pending%3dpending%2btag%3dpatch,pending%3dpending%2btag%3dconfirmed,pending%3dpending;ttl1=Will%20Not%20Fix,More%20information%20needed,Patch%20Available,Confirmed,Unclassified;ord1=2,3,4,1,0,5 Thanks for the link. Is there a simple way to find FTBFS without patch not already proposed (so I can help Debian GNU/KFreeBSD without duplicating work)? Can you please suggest me some linux-specific packages/APIs (i.e., not attempted to being built on GNU/KFreeBSD) but that should be ported to GNU/KFreeBSD in the medium/long term? Thanks, Luca Favatella -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Re: [patch] wine and jack-audio-connection-kit build problem
On 06/01/2009, Petr Salinger wrote: [...] > I occasionally write down some NOTES, see also popcon part in > http://glibc-bsd.alioth.debian.org/NOTES > I expect I will update it during next weekend. Thanks for your work. > Definitely openoffice.org and hal should be ported in the medium/long > term. And of course debian-installer ... > And ada (gnat-4.3) and ghc6 needs a bootstrap for kfreebsd-amd64. > > There are also some request to extend our freebsd-utils, see #492889. I'll take a look at some of them. I can't start the port of debian-installer because it is a too complex task for me. Thanks very much, Luca Favatella -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
[patch] consolekit on Debian GNU/KFreeBSD
Hi.
I managed to build the [consolekit package] on Debian GNU/KFreeBSD x86 32bit.
Here is the [consolekit buildd] log.
It seems there is no FTBFS in BTS for this package, and no patch in [patches].
Steps to build this package:
1) run "apt-get source consolekit"
2) add to debian/ the attouched file
"control" (I only added a build dependency on libkvm-dev)(BUT FOR
ALL ARCHITECTURES)
3) add to debian/patches/ the attouched files
"80-gnukfreebsd_support_configure.ac.patch"
"81-gnukfreebsd_support_pseudo_run_autoconf.patch"
"series" (I only added 80 and 81 to the list)
4) check for build dependencies using "dpkg-checkbuilddeps"
5) run "dpkg-buildpackage"
I'm also attouching a unified patch, consolekit.patch, got using
diff -ur --unidirectional-new-file consolekit-0.2.10.orig/
consolekit-0.2.10/ > consolekit.patch
WARNING: I CHANGED BUILD-DEPS FOR ALL ARCHITECTURES.
I tried (successfully) to install 2 of the built packages (I didn't
try the others) on x86 32bit.
I don't use this package, so I don't know if it works...
I noted that FreeBSD uses the same version of this package, but with a
lot of patches [freebsd patches].
I also noted that in FreeBSD consolekit is a dependency for hal (see
in [freebsd consolekit dependencies]), but I don't know if this will
be useful for the port of hal on Debian GNU/KFreeBSD.
I tried to port this package to understand how to port packages to
Debian GNU/KFreeBSD (and also to gain experience with Debian
packaging).
Can you please tell me if I did some errors?
Cheers,
Luca Favatella
[consolekit package]
http://packages.qa.debian.org/c/consolekit.html
[consolekit buildd]
http://buildd.debian-ports.org/fetch.php?pkg=consolekit&arch=kfreebsd-i386&ver=0.2.10-3&stamp=1228441494&file=log&as=raw
[patches]
http://glibc-bsd.alioth.debian.org/patches/
[freebsd patches]
http://www.freebsd.org/cgi/cvsweb.cgi/ports/sysutils/consolekit/
[freebsd consolekit dependencies]
http://www.freebsd.org/cgi/ports.cgi?query=hal&stype=all
control
Description: Binary data
--- ConsoleKit-0.2.10.orig/configure.ac 2008-02-13 04:55:50.0 +0100
+++ consolekit-0.2.10/configure.ac 2009-01-07 00:25:42.0 +0100
@@ -176,7 +176,7 @@
CK_BACKEND=""
KVM_LIBS=""
case "$host" in
-*-*-freebsd*)
+*-*-freebsd* | *-*-kfreebsd*-gnu)
CK_BACKEND="freebsd"
AC_CHECK_LIB(kvm, kvm_openfiles, have_kvm=yes,
AC_MSG_ERROR([Unable to find libkvm which is needed on FreeBSD]))
--- ConsoleKit-0.2.10.orig/configure 2008-02-26 01:39:59.0 +0100
+++ consolekit-0.2.10/configure 2009-01-07 00:27:59.0 +0100
@@ -23944,7 +23944,7 @@
CK_BACKEND=""
KVM_LIBS=""
case "$host" in
-*-*-freebsd*)
+*-*-freebsd* | *-*-kfreebsd*-gnu)
CK_BACKEND="freebsd"
{ echo "$as_me:$LINENO: checking for kvm_openfiles in -lkvm" >&5
echo $ECHO_N "checking for kvm_openfiles in -lkvm... $ECHO_C" >&6; }
series
Description: Binary data
diff -ur --unidirectional-new-file consolekit-0.2.10.orig/debian/control consolekit-0.2.10/debian/control
--- consolekit-0.2.10.orig/debian/control 2009-01-07 01:32:29.0 +0100
+++ consolekit-0.2.10/debian/control 2009-01-07 00:40:53.0 +0100
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Utopia Maintenance Team
Uploaders: Michael Biebl
-Build-Depends: cdbs, debhelper (>= 5), autotools-dev, pkg-config, ,quilt, libdbus-glib-1-dev (>= 0.30), libglib2.0-dev (>= 2.7.0), libx11-dev (>= 1.0.0), xmlto, libpam0g-dev, zlib1g-dev
+Build-Depends: cdbs, debhelper (>= 5), autotools-dev, pkg-config, ,quilt, libdbus-glib-1-dev (>= 0.30), libglib2.0-dev (>= 2.7.0), libkvm-dev, libx11-dev (>= 1.0.0), xmlto, libpam0g-dev, zlib1g-dev
Standards-Version: 3.8.0
Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/consolekit
Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/consolekit
diff -ur --unidirectional-new-file consolekit-0.2.10.orig/debian/patches/80-gnukfreebsd_support_configure.ac.patch consolekit-0.2.10/debian/patches/80-gnukfreebsd_support_configure.ac.patch
--- consolekit-0.2.10.orig/debian/patches/80-gnukfreebsd_support_configure.ac.patch 1970-01-01 01:00:00.0 +0100
+++ consolekit-0.2.10/debian/patches/80-gnukfreebsd_support_configure.ac.patch 2009-01-07 00:50:47.0 +0100
@@ -0,0 +1,11 @@
+--- ConsoleKit-0.2.10.orig/configure.ac 2008-02-13 04:55:50.0 +0100
consolekit-0.2.10/configure.ac 2009-01-07 00:25:42.0 +0100
+@@ -176,7 +176,7 @@
+ CK_BACKEND=""
+ KVM_LIBS=""
+ case "$host" in
+-*-*-freebsd*)
++*-*-freebsd* | *-*-kfreebsd*-gnu)
+ CK_BACKEND="freebsd"
+ AC_CHECK_LIB(kvm, kvm_openfiles, h
Re: [patch] consolekit on Debian GNU/KFreeBSD
On 08/01/2009, Petr Salinger wrote: >> WARNING: I CHANGED BUILD-DEPS FOR ALL ARCHITECTURES. >> Can you please tell me if I did some errors? > > It seems fine, the proper way for build-depends is > libkvm-dev [kfreebsd-i386 kfreebsd-amd64] Done. > Please, could you submit a corrected diff into debian BTS, with > User: glibc-bsd-de...@lists.alioth.debian.org > Usertags: kfreebsd Done. [bug #511270]. > Thanks for your work > > Petr Thanks for your reply. Luca Favatella [bug #511270] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=511270 -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
uudecode in freebsd-buildutils + kfreebsd-head or -8 packaging
Hi. I tried to build the FreeBSD HEAD kernel using the [debian kfreebsd-7] package (as described at [kfreebsd svn build]). I managed to start building it (using the svn diff attached), but it stops building saying: # ... # ld -d -warn-common -r -d -o if_iwn.kld if_iwn.o :> export_syms awk -f [BUILD_ROOT]/kfreebsd-7/flavor-7.1-1-486/sys/modules/iwn/../../conf/kmod_syms.awk if_iwn.kld export_syms | xargs -I% objcopy % if_iwn.kld gen-ld-u-options if_iwn.kld > if_iwn.lopt ld -Bshareable -d -warn-common -o if_iwn.ko if_iwn.kld "@if_iwn.lopt" objcopy --strip-debug if_iwn.ko ===> iwnfw (all) uudecode -p [BUILD_ROOT]/kfreebsd-7/flavor-7.1-1-486/sys/modules/iwnfw/../../contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu > iwlwifi-4965-4.44.17.fw uudecode: invalid option -- p Try `uudecode --help' for more information. *** Error code 1 Stop in [BUILD_ROOT]/kfreebsd-7/flavor-7.1-1-486/sys/modules/iwnfw. *** Error code 1 Stop in [BUILD_ROOT]/kfreebsd-7/flavor-7.1-1-486/sys/modules. *** Error code 1 Stop in [BUILD_ROOT]/kfreebsd-7/flavor-7.1-1-486/sys/i386/compile/DEBCUSTOM. make: *** [build-flavor-486-stamp] Error 1 dpkg-buildpackage: failure: debian/rules build gave error exit status 2 # END # It looks like FreeBSD HEAD needs the "p" option of the command "uudecode", that is not present in GNU sharutils version. Can you please consider including [freebsd 7.1.0 uudecode] (it seems the same that is in FreeBSD HEAD) in [debian freebsd-buildutils]? Are you also planning a kfreebsd-8 or kfreebsd-head package? If so, will it be only svn or also periodically built and uploaded to experimental? Thanks, Luca Favatella [debian kfreebsd-7] http://svn.debian.org/wsvn/glibc-bsd/trunk/kfreebsd-7/ [kfreebsd svn build] http://lists.debian.org/debian-bsd/2008/12/msg00011.html [freebsd 7.1.0 uudecode] http://svn.freebsd.org/viewvc/base/release/7.1.0/usr.bin/uudecode/uudecode.c?revision=186660&view=markup [debian freebsd-buildutils] http://svn.debian.org/wsvn/glibc-bsd/trunk/freebsd-buildutils/fetch?op=file&rev=0&sc=0 Index: debian/patches/999_config.diff === --- debian/patches/999_config.diff (revision 2353) +++ debian/patches/999_config.diff (working copy) @@ -2,9 +2,9 @@ === --- src.orig/sys/amd64/conf/GENERIC +++ src/sys/amd64/conf/GENERIC -@@ -18,13 +18,13 @@ +@@ -18,19 +18,19 @@ # - # $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.484.2.14 2008/08/29 18:54:35 jhb Exp $ + # $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.518 2009/01/19 15:33:06 sobomax Exp $ -cpu HAMMER -ident GENERIC @@ -15,6 +15,12 @@ -#hints "GENERIC.hints" # Default places to look for devices. +hints "GENERIC.hints" # Default places to look for devices. + # Use the following to compile in values accessible to the kernel + # through getenv() (or kenv(1) in userland). The format of the file + # is 'variable=value', see kenv(1) + # + # env "GENERIC.env" + -makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols +#makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols @@ -29,10 +35,11 @@ options PSEUDOFS # Pseudo-filesystem framework options GEOM_PART_GPT # GUID Partition Tables. options GEOM_LABEL # Provides labelization -@@ -53,7 +55,7 @@ +@@ -53,8 +55,8 @@ options COMPAT_FREEBSD4 # Compatible with FreeBSD4 options COMPAT_FREEBSD5 # Compatible with FreeBSD5 options COMPAT_FREEBSD6 # Compatible with FreeBSD6 + options COMPAT_FREEBSD7 # Compatible with FreeBSD7 -options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI +options SCSI_DELAY=2000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support @@ -77,21 +84,19 @@ # If you've got a "dumb" serial or parallel PCI card that is # supported by the puc(4) glue driver, uncomment the following -@@ -252,13 +249,8 @@ +@@ -252,11 +249,8 @@ device loop # Network loopback device random # Entropy device device ether # Ethernet support --device sl # Kernel SLIP --device ppp # Kernel PPP -device tun # Packet tunnel. - device pty # Pseudo-ttys (telnet etc) + device pty # BSD-style compatibility pseudo ttys device md # Memory "disks" -device gif # IPv6 and IPv4 tunneling -device faith # IPv6-to-IPv4 relaying (translation) device firmware # firmware assist module # The `bpf' device enables the Berkeley Packet Filter. -@@ -275,12 +267,9 @@ +@@ -275,13 +267,10 @@ device ugen # Generic device uhid # "Human Interface Devices" device ukbd # Keyboard @@ -99,6 +104,7 @@ device umass # Disks/Mass storage - Requires scbus and da device ums # Mouse device ural # Ralink Technology RT2500USB wireless NICs + device rum # Ralink Technology
Re: uudecode in freebsd-buildutils + kfreebsd-head or -8 packaging
On 04/02/2009, Petr Salinger wrote: [...] > Take a look at kfreebsd-7/debian/patches/913_uudecode.diff > It looks like it have to be extended for kfreebsd-8. > > Petr I didn't see it. Thanks, Luca Favatella -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
[kfreebsd-8] changelog help
Hi. I managed to build kfreebsd-8 (on kfreebsd-i386). In the attached ls.txt there are all packages built (there are no amd64 packages: is it ok?). I haven't tried to install and run it yet. I committed my work to svn. I didn't commit debian/changelog because I can't write it. Can you please review my proposed changelog attached (changelog.small)? And can you please explain me how to write a Debian changelog? Thanks, Luca Favatella kfreebsd-headers-8-486_8.0~cvs20090205-1_kfreebsd-i386.deb kfreebsd-headers-8-686-smp_8.0~cvs20090205-1_kfreebsd-i386.deb kfreebsd-headers-8-686_8.0~cvs20090205-1_kfreebsd-i386.deb kfreebsd-headers-8.0-0-486_8.0~cvs20090205-1_kfreebsd-i386.deb kfreebsd-headers-8.0-0-686-smp_8.0~cvs20090205-1_kfreebsd-i386.deb kfreebsd-headers-8.0-0-686_8.0~cvs20090205-1_kfreebsd-i386.deb kfreebsd-headers-8.0-0_8.0~cvs20090205-1_kfreebsd-i386.deb kfreebsd-image-8-486_8.0~cvs20090205-1_kfreebsd-i386.deb kfreebsd-image-8-686-smp_8.0~cvs20090205-1_kfreebsd-i386.deb kfreebsd-image-8-686_8.0~cvs20090205-1_kfreebsd-i386.deb kfreebsd-image-8.0-0-486_8.0~cvs20090205-1_kfreebsd-i386.deb kfreebsd-image-8.0-0-686-smp_8.0~cvs20090205-1_kfreebsd-i386.deb kfreebsd-image-8.0-0-686_8.0~cvs20090205-1_kfreebsd-i386.deb kfreebsd-source-8.0_8.0~cvs20090205-1_all.deb ndiswrapper-modules-8.0-0-486_8.0~cvs20090205-1_kfreebsd-i386.deb ndiswrapper-modules-8.0-0-686-smp_8.0~cvs20090205-1_kfreebsd-i386.deb ndiswrapper-modules-8.0-0-686_8.0~cvs20090205-1_kfreebsd-i386.deb changelog.small Description: Binary data
Re: Network config
On 06/02/2009, FITHIS wrote:
> Hi again, I tried to install it under Virtualbox (is sit supported?) as
> a start. Where can I find resources on how to configure networking?
>
> I have a pcn0 interface and I would like it to be dhcp enabled. I put
> dhclient=YES and dhclient_flags="pcn0" on my rc.conf but I also noticed
> that ping is not existent.
>
> Regards
> Vasileios
Hi.
I think this link is useful (I found it on the Debian wiki):
http://www.hermann-uwe.de/blog/testing-stuff-with-qemu-part-3-debian-gnu-kfreebsd
In particular:
"
Now let's fix networking, update the system and install a bunch of packages:
nano /etc/network/interfaces
Yes, there's no vi, not even a symlink to nano! Uncomment the two
"ed0" lines ("ed0" is the equivalent to "eth0" on Linux, I guess).
/etc/init.d/networking restart
"
At the moment I have not Debian GNU/kFreeBSD, so I can't help you with
my config.
Hope this helps,
Luca Favatella
--
To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
[gsoc2009] debian-installer on Debian GNU/kFreeBSD
(I don't know if I have to cc other Debian mailing lists) Hi. I would like to partecipate as a student in Google Summer of Code 2009. I'm interested in working on Debian GNU/kFreeBSD. I propose the project "Porting debian-installer on Debian GNU/kFreeBSD". I'm not able to complete this task alone. I need someone splitting this task in smaller subtasks to complete. Do you think this project is a good idea? Is there someone wanting to mentor me? Luca Favatella -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Re: [gsoc2009] debian-installer on Debian GNU/kFreeBSD
On 11/03/2009, Aurelien Jarno wrote: > On Wed, Mar 04, 2009 at 11:57:22PM +0100, Luca Favatella wrote: [...] > Note that we already have Ging, a Live CD running GNU/kFreeBSD [1]. It > is clearly outdated, but it shows how to boot from a CD-ROM, and use a > ramdisk that allow copy-on with the CD filesystem. Ok. > It may be a good idea to start porting Debian Live, that would make at > least a first step to reach. This is always good for projects with time > constraints, so that you have at least something to show at the end. > Then the boot process can be implemented the same way in > debian-installer. Can you please suggest me what to study first? debootstrap? debian-installer? ging? debian-live? >> Is there someone wanting to mentor me? > > I won't have a lot of time, but Colin Watson offered on IRC to share a > bit the load. I guess this mailing list is also a good way to have > technical hints. > > So in short the answer is yes. I'll make the necessary so that it can be > propose as a GSoC project. Thanks. > Best regards, > Aurelien Luca Favatella P.S. I tried debootstrap on Debian GNU/kFreeBSD i386. I executed: debootstrap sid . http://ftp.debian-ports.org/debian It doesn't work saying: W: Failure trying to run: chroot /home/user/[...]/debootstrap/. mount -t devfs devfs /dev I discovered that "mount" is in the package "freebsd-utils", and it is not selected by debootstrap. I tried debootstrap --include=freebsd-utils sid . http://ftp.debian-ports.org/debian It doesn't work saying: I: Checking component main on http://ftp.debian-ports.org/debian... E: Couldn't find these debs: freebsd-utils Con you please suggest me what to do to make debootstrap working? -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
debootstrap on Debian GNU/kFreeBSD
Hi. I'm trying to make debootstrap working on Debian GNU/kFreeBSD (i386). I executed: debootstrap sid . http://ftp.debian-ports.org/debian It doesn't work saying: W: Failure trying to run: chroot /home/user/[...]/debootstrap/. mount -t devfs devfs /dev I discovered that "mount" is in the package "freebsd-utils", and it is not selected by debootstrap. The problem is that freebsd-utils is in [unreleased] (not sid). debootstrap searches only in one suite (e.g. sid), so it can't find freebsd-utils. Can you please tell me if - someone already wrote patches for debootstrap to support more than a suite (at the same time, i.e. sid and unreleased)? - is there any plan to move freebsd-utils from unreleased to sid? I think that the clean solution is moving freebsd-utils to sid. Can you please tell me how can I help? Feel free to tell me if there is something wrong in what I am writing. Thanks, Luca Favatella [unreleased] http://ftp.debian-ports.org/debian/dists/unreleased/main/binary-kfreebsd-i386/Packages -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Re: debootstrap on Debian GNU/kFreeBSD
On 13/03/2009, Cyril Brulebois wrote: > Luca Favatella (12/03/2009): >> Can you please tell me if >> - someone already wrote patches for debootstrap to support more than a >> suite (at the same time, i.e. sid and unreleased)? > > http://lists.debian.org/debian-bsd/2007/08/msg5.html > > Mraw, > KiBi. > Thanks very much, Luca Favatella -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
[patch]Re: debootstrap on Debian GNU/kFreeBSD + questions
On 13/03/2009, Cyril Brulebois wrote:
> Luca Favatella (12/03/2009):
>> Can you please tell me if
>> - someone already wrote patches for debootstrap to support more than a
>> suite (at the same time, i.e. sid and unreleased)?
>
> http://lists.debian.org/debian-bsd/2007/08/msg5.html
Why didn't this code go in debootstrap svn (just curious)?
This git link seems not working.
git://alioth.debian.org/~kibi-guest/debootstrap.git
I refreshed (against current debootstrap svn) the patches at
http://users.alioth.debian.org/~kibi-guest/kfreebsd/
I am attaching the "svn diff".
I hope I did no mistakes. The most difficult things to decide for me
have been " characters.
I tried to run kbsd-debootstrap.sh (the refreshed one by me). I got:
/lib/freebsd/mount: error while loading shared libraries: libbsd.so.0:
cannot open shared object file: No such file or directory
After chrooting in sandbox, I installed (with dpkg) libc0.1, libgcc1
and libbsd0 (all packages where already downloaded in /var/cache/...).
After that, I tried:
mount -t devfs devfs /dev
and I got no error.
It seems to me that in debootstrap:
-or libbsd0 (and other packages) are downloaded but not extracted
-or mount is called too early
Can you please consider commenting this results?
Can you also consider replying to at least some of the following questions?
Is there any possibility to merge these refreshed patches in debootstrap svn?
Is there any collection of tests to ensure that no regressions is
introduced in debootstrap?
Is there any rewriting effort of debootstrap underway?
Should I consider improving crosshurd, or is it deprecated in favour
of debootstrap?
I noted that ging (Debian GNU/kFreeBSD live cd) is based upon
crosshurd: if I play with ging, should I consider improving crosshurd
or porting it to debootstrap?
Thanks in advance,
Luca Favatella
Index: kbsd-debootstrap.sh
===
--- kbsd-debootstrap.sh (revision 0)
+++ kbsd-debootstrap.sh (revision 0)
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+# First guess for needed "unreleased" packages:
+#
+# grep-dctrl -F Priority 'required' -s Package \
+# < /var/cache/apt/lists/ftp.debian-ports.org_debian_dists_unreleased_main_binary-kfreebsd-i386_Package \
+# | awk '{print $2}' | xargs ./scripts/porters/extra-dependencies.pl --extra-only module-init-tools net-tools
+#
+# "module-init-tools" has been added manually after a first run, due to an alternative
+# "kfreebsd-image" has not been added since it is a virtual package
+#
+# "net-tools" has been added as Depends of packages from "unstable"
+#
+#
+# Needed "unstable" packages:
+#
+# "libbsd0" and "ufsutils" have been added as Depends of packages from "unstable"
+#
+./debootstrap \
+ --include="libbsd0 ufsutils" \
+ --keep-debootstrap-dir \
+ --extra-include="bsdutils freebsd-hackedutils freebsd-utils kfreebsd-loader libfreebsd0 libgeom0 libipx2 libkiconv3 libkvm0 libsbuf0 module-init-tools net-tools util-linux" \
+ --extra-suite "unreleased" \
+ --extra-mirror http://ftp.debian-ports.org/debian \
+ sid \
+ ../sandbox \
+ http://ftp.debian-ports.org/debian \
+ scripts/debian/sid
Index: debootstrap
===
--- debootstrap (revision 57816)
+++ debootstrap (working copy)
@@ -9,6 +9,9 @@
if [ "$DEBOOTSTRAP_DIR" = "" ]; then
if [ -x /debootstrap/debootstrap ]; then
DEBOOTSTRAP_DIR=/debootstrap
+ elif [ -x $(pwd)/debootstrap ]; then
+ echo "Warning: Make sure that 'fakeroot make devices.tar.gz' was done"
+ DEBOOTSTRAP_DIR=$(pwd)
else
DEBOOTSTRAP_DIR=/usr/share/debootstrap
fi
@@ -93,6 +96,8 @@
(requires --second-stage)
--boot-floppiesused for internal purposes by boot-floppies
--debian-installer used for internal purposes by debian-installer
+
+ --extra-* used by porters, see the manpage
EOF
}
@@ -283,6 +288,26 @@
error 1 NEEDARG "option requires an argument %s" "$1"
fi
;;
+--extra-mirror)
+ if [ -n "$2" ] ; then
+ EXTRA_MIRROR="$2"
+ shift 2
+ else
+ error 1 NEEDARG "option requires an argument %s" "$1"
+ fi
+ ;;
+--extra-suite)
+ if [ -n "$2" ] ; then
+ EXTRA_SUITE="$2"
+ shift 2
+ else
+ error 1 NEEDARG "option requires an argument %s" "$1"
+ fi
+ ;;
+--extra-include*)
+ extra_debs="$(echo $1 | cut -f2 -d"="|tr , " ")"
+ shift 1
+ ;;
--*)
error 1 BADARG "unrecognized or invalid option %s" "$1"
;;
@@ -349,8 +374,12 @@
error 1 WHATARCH "Couldn't work o
Re: [patch]Re: debootstrap on Debian GNU/kFreeBSD + questions
On 15/03/2009, Otavio Salvador wrote:
> Luk Claes writes:
>
>> Otavio Salvador wrote:
[...]
>>> While I understand why those options are required I dislike the idea to
>>> have them at official deboostrap.
>>
>> They are more generally useful though. Everyone who wants to test with
>> adding extra packages (that are not in Debian proper) to base could use
>> them.
>
> To make easy for us to decide about it all, it would be nice if Luca
> could split the patch in two. One adding the
> --extra-{mirror,suite,include} options and another with freebsd
> specifics. Could you (Luca) take a look and split it for us?
Ok.
I hope to do this tomorrow.
--
To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Re: [patch]Re: debootstrap on Debian GNU/kFreeBSD + questions
On 15/03/2009, Luk Claes wrote: > Otavio Salvador wrote: >> Luca Favatella writes: [...] >>> It seems to me that in debootstrap: >>> -or libbsd0 (and other packages) are downloaded but not extracted >>> -or mount is called too early >> >> It happens depending on the priority so mount is called early in case of >> bsd; I belive that it needs to be part of base in kfreebsd to properly >> fix it. > > I also think it's because the mount providing package has a too low > priority field. The mount providing package is [freebsd-utils]. [freebsd-utils] http://debian-ports.org/debian/pool-kfreebsd-i386/main/f/freebsd-utils/ -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Re: [patch]Re: debootstrap on Debian GNU/kFreeBSD + questions
On 15/03/2009, Otavio Salvador wrote: > Luca Favatella writes: [...] >> I tried to run kbsd-debootstrap.sh (the refreshed one by me). I got: [...] > First I'm curious why to use another script to install instead of > regular debootstrap. Did you try to "merge" your required changes in > debootstrap? kbsd-debootstrap.sh simply calls debootstrap with the right arguments on kfreebsd-i386. Perhaps this code should go on wiki.debian.org instead of being is some repositories around the net. [...] >> Is there any rewriting effort of debootstrap underway? > > Not ATM. Why it would be required? I didn't say that it is required. I asked for this only to know if deboostrap svn was fast moving in this period. Thanks, Luca Favatella -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Re: [patch]Re: debootstrap on Debian GNU/kFreeBSD + questions
On 15/03/2009, Otavio Salvador wrote:
> Luk Claes writes:
>
>> Otavio Salvador wrote:
[...]
>>> While I understand why those options are required I dislike the idea to
>>> have them at official deboostrap.
>>
>> They are more generally useful though. Everyone who wants to test with
>> adding extra packages (that are not in Debian proper) to base could use
>> them.
>
> To make easy for us to decide about it all, it would be nice if Luca
> could split the patch in two. One adding the
> --extra-{mirror,suite,include} options and another with freebsd
> specifics. Could you (Luca) take a look and split it for us?
Here they are.
libc_svn.diff
I think this could go into debootstrap svn without further testing.
extra_svn.diff
Add the --extra-{mirror,suite,include} options; needs review and testing.
extra-dependencies.pl
This file is useful to find packages to feed the --extra-include
option (but its result needs manual tuning, as you can see in
kbsd-debootstrap.sh comments).
This doesn't look to me freebsd-specific, but I think this should go
to the wiki instead of svn.
kbsd-debootstrap.sh
This script is a useful example to understand how to call debootstrap
with --extra-{mirror,suite,include} options for kfreebsd-i386.
This should go to the wiki.
Hope this helps,
Luca Favatella
Index: scripts/debian/sid
===
--- scripts/debian/sid (revision 57816)
+++ scripts/debian/sid (working copy)
@@ -8,11 +8,11 @@
fi
LIBC=libc6
-if [ "$ARCH" = "alpha" ] || [ "$ARCH" = "ia64" ]; then
- LIBC="libc6.1"
-elif [ "$ARCH" = "hurd-i386" ]; then
- LIBC="libc0.3"
-fi
+case $ARCH in
+ alpha|ia64) LIBC6="libc6.1" ;;
+ kfreebsd-*) LIBC6="libc0.1" ;;
+ hurd-*) LIBC6="libc0.3" ;;
+esac
work_out_debs () {
required="$(get_debs Priority: required)"
Index: debootstrap
===
--- debootstrap (revision 57816)
+++ debootstrap (working copy)
@@ -9,6 +9,9 @@
if [ "$DEBOOTSTRAP_DIR" = "" ]; then
if [ -x /debootstrap/debootstrap ]; then
DEBOOTSTRAP_DIR=/debootstrap
+ elif [ -x $(pwd)/debootstrap ]; then
+ echo "Warning: Make sure that 'fakeroot make devices.tar.gz' was done"
+ DEBOOTSTRAP_DIR=$(pwd)
else
DEBOOTSTRAP_DIR=/usr/share/debootstrap
fi
@@ -93,6 +96,8 @@
(requires --second-stage)
--boot-floppiesused for internal purposes by boot-floppies
--debian-installer used for internal purposes by debian-installer
+
+ --extra-* used by porters, see the manpage
EOF
}
@@ -283,6 +288,26 @@
error 1 NEEDARG "option requires an argument %s" "$1"
fi
;;
+--extra-mirror)
+ if [ -n "$2" ] ; then
+ EXTRA_MIRROR="$2"
+ shift 2
+ else
+ error 1 NEEDARG "option requires an argument %s" "$1"
+ fi
+ ;;
+--extra-suite)
+ if [ -n "$2" ] ; then
+ EXTRA_SUITE="$2"
+ shift 2
+ else
+ error 1 NEEDARG "option requires an argument %s" "$1"
+ fi
+ ;;
+--extra-include*)
+ extra_debs="$(echo $1 | cut -f2 -d"="|tr , " ")"
+ shift 1
+ ;;
--*)
error 1 BADARG "unrecognized or invalid option %s" "$1"
;;
@@ -349,8 +374,12 @@
error 1 WHATARCH "Couldn't work out current architecture"
fi
-export ARCH SUITE TARGET
+if [ "$extra_debs" != "" -a "$EXTRA_SUITE" = "" ]; then
+ EXTRA_SUITE="unreleased"
+fi
+export ARCH SUITE TARGET EXTRA_SUITE
+
if am_doing_phase first_stage second_stage; then
if [ -x /usr/bin/id ] && [ `id -u` -ne 0 ]; then
error 1 NEEDROOT "debootstrap can only run as root"
@@ -430,8 +459,12 @@
fi
fi
-export MIRRORS
+if [ "$EXTRA_MIRROR" = "" ]; then
+ EXTRA_MIRROR="$MIRRORS"
+fi
+export MIRRORS EXTRA_MIRROR
+
ok=false
for v in $SUPPORTED_VARIANTS; do
if doing_variant $v; then ok=true; fi
@@ -445,7 +478,12 @@
if am_doing_phase finddebs; then
if [ "$FINDDEBS_NEEDS_INDICES" = "true" ] || \
[ "$RESOLVE_DEPS" = "true" ]; then
- download_indices
+ download_indices "$SUITE" "$MIRRORS"
+ # The test might be skipped if download_indices() can detect that
+ # it didn't receive two parameters
+ if [ "$extra_debs" != "" ]; then
+ download_indices "$EXTRA_SUITE" "$EXTRA_MIRROR"
+ fi
GOT_INDICES=true
fi
@@ -492,9 +530,16 @@
if am_doing_phase dldebs; then
if [ "$GOT_INDICES" != "true" ]; then
- downl
Re: [patch]Re: debootstrap on Debian GNU/kFreeBSD + questions
On 16/03/2009, Otavio Salvador wrote:
> Luca Favatella writes:
>
>> On 15/03/2009, Otavio Salvador wrote:
[...]
>> libc_svn.diff
>> I think this could go into debootstrap svn without further testing.
>
> Commited. It was wrong and Colin has catch it just after my
> commit. Fixed in SVN.
Thanks.
>> extra_svn.diff
>> Add the --extra-{mirror,suite,include} options; needs review and testing.
>
> See comments.
[...]
> This should be splited. This is indeed useful and would be nice to warn
> also that it is using the local copy. But this is unrelated to rest of
> the patch.
I removed that.
[...]
> I dislike to have it as default. It is better to raise a error and force
> user to provide it.
At the moment I didn't modify this.
In the diff attached I removed a sentence in the man page referring to
the old file in scripts/porters (one of the 2 files that should go to
the wiki).
Index: debootstrap
===
--- debootstrap (revision 57816)
+++ debootstrap (working copy)
@@ -93,6 +96,8 @@
(requires --second-stage)
--boot-floppiesused for internal purposes by boot-floppies
--debian-installer used for internal purposes by debian-installer
+
+ --extra-* used by porters, see the manpage
EOF
}
@@ -283,6 +288,26 @@
error 1 NEEDARG "option requires an argument %s" "$1"
fi
;;
+--extra-mirror)
+ if [ -n "$2" ] ; then
+ EXTRA_MIRROR="$2"
+ shift 2
+ else
+ error 1 NEEDARG "option requires an argument %s" "$1"
+ fi
+ ;;
+--extra-suite)
+ if [ -n "$2" ] ; then
+ EXTRA_SUITE="$2"
+ shift 2
+ else
+ error 1 NEEDARG "option requires an argument %s" "$1"
+ fi
+ ;;
+--extra-include*)
+ extra_debs="$(echo $1 | cut -f2 -d"="|tr , " ")"
+ shift 1
+ ;;
--*)
error 1 BADARG "unrecognized or invalid option %s" "$1"
;;
@@ -349,8 +374,12 @@
error 1 WHATARCH "Couldn't work out current architecture"
fi
-export ARCH SUITE TARGET
+if [ "$extra_debs" != "" -a "$EXTRA_SUITE" = "" ]; then
+ EXTRA_SUITE="unreleased"
+fi
+export ARCH SUITE TARGET EXTRA_SUITE
+
if am_doing_phase first_stage second_stage; then
if [ -x /usr/bin/id ] && [ `id -u` -ne 0 ]; then
error 1 NEEDROOT "debootstrap can only run as root"
@@ -430,8 +459,12 @@
fi
fi
-export MIRRORS
+if [ "$EXTRA_MIRROR" = "" ]; then
+ EXTRA_MIRROR="$MIRRORS"
+fi
+export MIRRORS EXTRA_MIRROR
+
ok=false
for v in $SUPPORTED_VARIANTS; do
if doing_variant $v; then ok=true; fi
@@ -445,7 +478,12 @@
if am_doing_phase finddebs; then
if [ "$FINDDEBS_NEEDS_INDICES" = "true" ] || \
[ "$RESOLVE_DEPS" = "true" ]; then
- download_indices
+ download_indices "$SUITE" "$MIRRORS"
+ # The test might be skipped if download_indices() can detect that
+ # it didn't receive two parameters
+ if [ "$extra_debs" != "" ]; then
+ download_indices "$EXTRA_SUITE" "$EXTRA_MIRROR"
+ fi
GOT_INDICES=true
fi
@@ -492,9 +530,16 @@
if am_doing_phase dldebs; then
if [ "$GOT_INDICES" != "true" ]; then
- download_indices
+ download_indices "$SUITE" "$MIRRORS"
+ # The test might be skipped if download_indices() can detect that
+ # it didn't receive two parameters
+ if [ "$extra_debs" != "" ]; then
+ download_indices "$EXTRA_SUITE" "$EXTRA_MIRROR"
+ fi
fi
- download $all_debs
+ # Separate download needed: different suite/mirror
+ download "$SUITE" "$MIRRORS" $all_debs
+ download "$EXTRA_SUITE" "$EXTRA_MIRROR" $extra_debs
fi
if am_doing_phase maketarball; then
@@ -502,6 +547,10 @@
tar czf - var/lib/apt var/cache/apt) >$MAKE_TARBALL
fi
+# Could be more fine-grained by handling $extra_debs until the end.
+# Probably not needed, so merging $required and $extra_debs
+required="$required $extra_debs"
+
if am_doing_phase first_stage; then
# first stage sets up the chroot -- no calls should be made to
# "chroot $TARGET" here; but they should be possible by the time it's
@@ -542,12 +591,16 @@
rm -f "$TARGET/etc/apt/sources.list"
fi
if [ "${MIRRORS#http://}"; != "$MIRRORS" ]; then
- setup_apt_sources "${MIRRORS%% *}"
- mv_invalid_to "${MIRRORS%% *}"
+ setup_apt_sources $SUITE "${MIRRORS%% *}"
+ mv_invalid_to $SUITE "${MIRRORS%% *}"
else
- setup_apt_sources "$DEF_
Re: [patch]Re: debootstrap on Debian GNU/kFreeBSD + questions
On 16/03/2009, Otavio Salvador wrote: [..] > Please take a look on the comments Colin has raised and refactorise it. > > So we can go ahead and continue the reviewing. I'm afraid i will not be able to continue working on this until the start of the next week. Sorry, Luca Favatella -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Re: [patch]Re: debootstrap on Debian GNU/kFreeBSD + questions
On 05/04/2009, Aurelien Jarno wrote: > On Fri, Mar 13, 2009 at 06:29:00PM +0100, Luca Favatella wrote: >> On 13/03/2009, Cyril Brulebois wrote: >> > Luca Favatella (12/03/2009): >> >> Can you please tell me if >> >> - someone already wrote patches for debootstrap to support more than a >> >> suite (at the same time, i.e. sid and unreleased)? > > Please note that as GNU/kFreeBSD is being integrated into the archive, a > debootstrap will work out of the box probably soon. Great. Thanks. -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
package containing /libexec/ld-elf.so.1?
Hi.
I'm trying to refresh ging.
I get:
cp: cannot stat `tmp//libexec/ld-elf.so.1': No such file or directory
Can you please suggest me what package contains /libexec/ld-elf.so.1
(on GNU/kFreeBSD x86)?
Thanks,
Luca Favatella
P.S.
I attach my patches against ging svn.
I don't think they should be committed.
I'm attaching them only if you want to play with them.
Consider that in /etc/crosshurd/packages/kfreebsd-gnu I substituted
"kfreebsd-image-5-486" with "kfreebsd-image-7-486".
At the moment I'm continuing using crosshurd, but when the archive
will contain all packages for a working debootstrap, if I'll find some
spare time I hope to port ging to debootstrap.
Index: tarball.sh
===
--- tarball.sh (revision 2390)
+++ tarball.sh (working copy)
@@ -28,6 +28,15 @@
##
/usr/share/crosshurd/makehurddir.sh ./tmp ${cpu} ${system}
+# crosshurd downloads some packages but doesn't extract them; work
+# around extracting them manually; chroot is needed (or perhaps we can
+# do without it, I don't know)
+chroot ./tmp dpkg --force-depends -i var/cache/apt/archives/libc0.1_2.9-6_kfreebsd-i386.deb
+chroot ./tmp dpkg -i var/cache/apt/archives/gcc-4.3-base_4.3.3-5_kfreebsd-i386.deb
+chroot ./tmp dpkg -i var/cache/apt/archives/libgcc1_1%3a4.3.3-5_kfreebsd-i386.deb
+chroot ./tmp dpkg -i var/cache/apt/archives/libfreebsd0_0.0-5_kfreebsd-i386.deb
+chroot ./tmp dpkg -i var/cache/apt/archives/libbsd0_0.0.1-2_kfreebsd-i386.deb
+
cat > ./tmp/etc/apt/apt.conf << __EOF__
APT::Get::AllowUnauthenticated "yes";
__EOF__
Index: packages
===
--- packages (revision 2390)
+++ packages (working copy)
@@ -1,27 +1,27 @@
# desktop environment
-gaim
-gimp
-gtk2-engines-gtk-qt
-kde-core
+#gaim
+#gimp
+#gtk2-engines-gtk-qt
+#kde-core
# no work yet
#kdm
-koffice
-konqueror
-xscreensaver
-x-window-system-core
+#koffice
+#konqueror
+#xscreensaver
+#x-window-system-core
# some games
-defendguin
-tuxtype
-xbill
-wesnoth
+#defendguin
+#tuxtype
+#xbill
+#wesnoth
# needed by ging internal purposes
adduser
dhcp3-client
-kfreebsd-image-5-586
+kfreebsd-image-7-486
# misc
Index: mfsroot.sh
===
--- mfsroot.sh (revision 2381)
+++ mfsroot.sh (working copy)
@@ -35,9 +35,9 @@
/bin/sh /bin/bash \
/lib/ld.so.1 /lib/libc.so.0.1 /lib/libncurses.so.5 /lib/libdl.so.2 \
/sbin/mdconfig \
-/libexec/ld-elf.so.1 /lib/libc.so.5 \
+/libexec/ld-elf.so.1 /lib/libc.so.6 \
/sbin/mount_cd9660 \
-/lib/libkiconv.so.1 \
+/usr/lib/libkiconv.so.3 \
${NULL}
do
mkdir -p ${mnt}/$i
Re: package containing /libexec/ld-elf.so.1?
On 06/04/2009, Petr Salinger wrote: >> I'm trying to refresh ging. >> >> I get: >> cp: cannot stat `tmp//libexec/ld-elf.so.1': No such file or directory >> >> Can you please suggest me what package contains /libexec/ld-elf.so.1 >> (on GNU/kFreeBSD x86)? > > I guess freebsd-hackedutils. May be it is not needed any more, > it used to provide i.e. ifconfig and route binaries. > > Petr Thanks. I'll look at it. -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Re: [Glibc-bsd-commits] r2431 - trunk/web/ging
On 10/04/2009, Aurelien Jarno wrote: > On Fri, Apr 10, 2009 at 06:14:06PM +0000, Luca Favatella wrote: [...] >> -emacs-snapshot-nox > > This was at the time emacs21 was not working on GNU/kFreeBSD, that's why > we have chosen a snapshot version. Now emacs22 is working fine. > >> -freebsd-gdb > Same here, gdb can be installed instead > >> +#emacs-snapshot-nox >> +#freebsd-gdb Fixed in svn. Thanks. -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
[patch] uniform libc handling among kernels
This patch (against d-i trunk) aims to handle libc the same way also on GNU/kFreeBSD (libc0.1) and GNU/Hurd (libc0.3). Tested on kfreebsd-i386, creating a d-i image without needing libc locale deb or udeb. Cheers, Luca Favatella Index: installer/build/pkg-lists/exclude === --- installer/build/pkg-lists/exclude (.../trunk) (revision 59039) +++ installer/build/pkg-lists/exclude (.../branches/d-i/kfreebsd) (revision 59039) @@ -3,6 +3,10 @@ # reduction step. # libc gets reduced, so using the udeb is not a good idea +libc0.1 - +libc0.1-udeb - +libc0.3 - +libc0.3-udeb - libc6 - libc6-udeb - libc6.1 - Index: installer/build/util/get-packages === --- installer/build/util/get-packages (.../trunk) (revision 59039) +++ installer/build/util/get-packages (.../branches/d-i/kfreebsd) (revision 59039) @@ -103,7 +103,7 @@ echo -n > $APTDIR/state/status # Some archs have libc6, others have libc6.1. libgcc1 is not used # on all architectures. - for i in libc6 libc6.1 libnewt0.52 libgcc1; do + for i in libc0.1 libc0.3 libc6 libc6.1 libnewt0.52 libgcc1; do if dpkg -s $i >/dev/null 2>&1; then dpkg -s $i | grep -v Depends: >> $APTDIR/state/status echo >> $APTDIR/state/status
[patch] kfreebsd-i386 kernel udeb
This patch (against d-i trunk) adds a kfreebsd-i386 kernel udeb. This work was done in the previous d-i kfreeebsd branch (svn://svn.debian.org/d-i/branches/d-i/kfree...@47541). I updated it, writing my changes in the changelog. It builds with an unmodified kernel-wedge. Its build process is not very clean (there are some warnings), nevertheless I think this package should not introduce regressions in trunk. I tested the kernel image and the acpi modules in kfreebsd-i386 d-i monolithic mini.iso (it boots). Cheers, Luca Favatella Index: packages/kernel/kfreebsd-kernel-di-i386/debian/changelog === --- packages/kernel/kfreebsd-kernel-di-i386/debian/changelog (.../trunk) (revision 0) +++ packages/kernel/kfreebsd-kernel-di-i386/debian/changelog (.../branches/d-i/kfreebsd) (revision 59039) @@ -0,0 +1,11 @@ +kfreebsd-kernel-di-i386 (0.1) UNRELEASED; urgency=low + + [ Robert Millan ] + * First upload. + + [ Luca Favatella ] + * Update kernel version. + * Disable mouse modules for building success. + * Enable building kernel image. + + -- Robert Millan Thu, 27 Apr 2006 20:50:53 +0200 Index: packages/kernel/kfreebsd-kernel-di-i386/debian/copyright === --- packages/kernel/kfreebsd-kernel-di-i386/debian/copyright (.../trunk) (revision 0) +++ packages/kernel/kfreebsd-kernel-di-i386/debian/copyright (.../branches/d-i/kfreebsd) (revision 59039) @@ -0,0 +1,5 @@ +This package is Copyright (c) 2001-2002 Herbert Xu +and Copyright 2001, 2003 by Joey Hess . + +It is licensed under the terms of the GNU GPL, see +/usr/share/common-licenses/GPL Index: packages/kernel/kfreebsd-kernel-di-i386/debian/rules === --- packages/kernel/kfreebsd-kernel-di-i386/debian/rules (.../trunk) (revision 0) +++ packages/kernel/kfreebsd-kernel-di-i386/debian/rules (.../branches/d-i/kfreebsd) (revision 59039) @@ -0,0 +1,2 @@ +#!/usr/bin/make -f +include /usr/share/kernel-wedge/generic-rules Property changes on: packages/kernel/kfreebsd-kernel-di-i386/debian/rules ___ Added: svn:executable + * Index: packages/kernel/kfreebsd-kernel-di-i386/debian/control.stub === --- packages/kernel/kfreebsd-kernel-di-i386/debian/control.stub (.../trunk) (revision 0) +++ packages/kernel/kfreebsd-kernel-di-i386/debian/control.stub (.../branches/d-i/kfreebsd) (revision 59039) @@ -0,0 +1,6 @@ +Source: kfreebsd-kernel-di-i386 +Section: debian-installer +Priority: optional +Maintainer: Debian Install System Team +Uploaders: Otavio Salvador +Build-Depends: kernel-wedge (>= 2.22) Index: packages/kernel/kfreebsd-kernel-di-i386/package-list === --- packages/kernel/kfreebsd-kernel-di-i386/package-list (.../trunk) (revision 0) +++ packages/kernel/kfreebsd-kernel-di-i386/package-list (.../branches/d-i/kfreebsd) (revision 59039) @@ -0,0 +1,29 @@ +# This file is used to build up the control file. The kernel version and +# "-di" are appended to the package names. Section can be left out. So can +# architecture, which is derived from the files in the modules directory. +# It overwrites specifications from /usr/share/kernel-wedge/package-list. +# +Package: kernel-image +Depends: acpi-modules +Provides: ufs-modules + +Package: fat-modules +Priority: standard + +Package: nic-modules +Depends: kernel-image, nic-shared-modules, firmware-modules, firewire-core-modules + +Package: scsi-modules +Depends: kernel-image, isa-pnp-modules, scsi-core-modules, parport-modules, cdrom-core-modules, firmware-modules + +Package: nic-extra-modules +Depends: kernel-image, isa-pnp-modules, nic-shared-modules, firmware-modules, crc-modules + +Package: nic-usb-modules +Depends: kernel-image, nic-shared-modules, usb-modules, firmware-modules + +Package: ppp-modules +Depends: serial-modules, kernel-image, crc-modules + +Package: pcmcia-modules +Depends: kernel-image, isa-pnp-modules, firmware-modules Index: packages/kernel/kfreebsd-kernel-di-i386/kernel-versions === --- packages/kernel/kfreebsd-kernel-di-i386/kernel-versions (.../trunk) (revision 0) +++ packages/kernel/kfreebsd-kernel-di-i386/kernel-versions (.../branches/d-i/kfreebsd) (revision 59039) @@ -0,0 +1,2 @@ +# arch version flavour installedname suffix build-depends +kfreebsd-i386 7.2-2 486 7.2-1-486 - kfreebsd-image-7.2-1-486 Index: packages/kernel/kfreebsd-kernel-di-i386/modules/kfreebsd-i386/floppy-modules === --- packages/kernel/kfreebsd-kernel-di-i386/modules/kfreebsd-i386/floppy-modules (.../trunk) (revision 0) +++ packages/kernel/kfreebsd-kernel-di-i386/modules/kfreebsd-i386/floppy-modules (...
Re: [patch] uniform libc handling among kernels
On 22/06/2009, Otavio Salvador wrote: > Hello Luca, > > On Mon, Jun 22, 2009 at 7:09 AM, Luca Favatella wrote: >> This patch (against d-i trunk) aims to handle libc the same way also >> on GNU/kFreeBSD (libc0.1) and GNU/Hurd (libc0.3). > > You've forgotten the changelog entry ;-) Fixed in attached patch. Thanks, Luca Favatella Index: installer/build/pkg-lists/exclude === --- installer/build/pkg-lists/exclude (.../trunk) (revision 59039) +++ installer/build/pkg-lists/exclude (.../branches/d-i/kfreebsd) (revision 59044) @@ -3,6 +3,10 @@ # reduction step. # libc gets reduced, so using the udeb is not a good idea +libc0.1 - +libc0.1-udeb - +libc0.3 - +libc0.3-udeb - libc6 - libc6-udeb - libc6.1 - Index: installer/build/util/get-packages === --- installer/build/util/get-packages (.../trunk) (revision 59039) +++ installer/build/util/get-packages (.../branches/d-i/kfreebsd) (revision 59044) @@ -103,7 +103,7 @@ echo -n > $APTDIR/state/status # Some archs have libc6, others have libc6.1. libgcc1 is not used # on all architectures. - for i in libc6 libc6.1 libnewt0.52 libgcc1; do + for i in libc0.1 libc0.3 libc6 libc6.1 libnewt0.52 libgcc1; do if dpkg -s $i >/dev/null 2>&1; then dpkg -s $i | grep -v Depends: >> $APTDIR/state/status echo >> $APTDIR/state/status Index: installer/debian/changelog === --- installer/debian/changelog (.../trunk) (revision 59039) +++ installer/debian/changelog (.../branches/d-i/kfreebsd) (revision 59044) @@ -74,6 +74,9 @@ environments from the boot menu for netboot/miniiso-based installs. * sparc: display message for unsupported subarchitectures (mini.iso). + [ Luca Favatella ] + * Handle libc0.1 (GNU/kFreeBSD) and libc0.3 (GNU/Hurd) as libc6/libc6.1. + -- Frans Pop Sat, 13 Jun 2009 16:35:46 +0200 debian-installer (20090123) unstable; urgency=low
[patch] netcfg get_all_ifs()
This patch substitutes Linux-specific code in get_all_ifs() using getifaddrs().
I tested this patch on (linux-)i386 trunk monolithic.
It builds and seems to work without regressions.
I only tested on default qemu, and the network seems to behave as
usual (I didn't complete the installation, but it seems to
download/unpack/configure downloaded packages).
I tested this patch in a draft hackish port of netcfg on kfreebsd-i386
(see d-i kfreebsd branch), and it builds.
netcfg is not working on kfreebsd-i386, but at least now it creates a
saner /etc/network/interfaces (i.e. with ed0, not eth0).
Cheers,
Luca Favatella
P.S.
At the moment I'm trying to port netcfg on GNU/kFreeBSD.
If reading the code of netcfg you find some Linux-specific code that
could be easily rewritten to be more portable (at least on GNU/k*BSD),
please try to get it in trunk or drop me a patch.
Index: debian/changelog
===
--- debian/changelog (.../trunk/packages/netcfg) (revisione 59247)
+++ debian/changelog (.../branches/d-i/kfreebsd/packages/netcfg) (revisione 59252)
@@ -8,6 +8,7 @@
* If wireless is disabled, don't build and link wireless related stuff.
* Disable by default wireless on non-linux architectures.
* Inverse the logic about building without wireless support (WIRELESS=0).
+ * Substitute Linux-specific code in get_all_ifs() using getifaddrs().
[ Colin Watson ]
* check_kill_switch is Linux-specific; provide a stub implementation for
Index: netcfg-common.c
===
--- netcfg-common.c (.../trunk/packages/netcfg) (revisione 59247)
+++ netcfg-common.c (.../branches/d-i/kfreebsd/packages/netcfg) (revisione 59252)
@@ -45,6 +45,8 @@
#include
#include
+#include
+
/* Set if there is currently a progress bar displayed. */
int netcfg_progress_displayed = 0;
@@ -227,53 +233,24 @@
return ((ifr.ifr_flags & IFF_UP) ? 1 : 0);
}
-void get_name(char *name, char *p)
-{
-while (isspace(*p))
-p++;
-while (*p) {
-if (isspace(*p))
-break;
-if (*p == ':') { /* could be an alias */
-char *dot = p, *dotname = name;
-*name++ = *p++;
-while (isdigit(*p))
-*name++ = *p++;
-if (*p != ':') { /* it wasn't, backup */
-p = dot;
-name = dotname;
-}
-if (*p == '\0')
-return;
-p++;
-break;
-}
-*name++ = *p++;
-}
-*name++ = '\0';
-return;
-}
-
int get_all_ifs (int all, char*** ptr)
{
-FILE *ifs = NULL;
-char ibuf[512], rbuf[512];
+struct ifaddrs *ifap, *ifa;
+char ibuf[512];
char** list = NULL;
size_t len = 0;
-if ((ifs = fopen("/proc/net/dev", "r")) != NULL) {
-fgets(ibuf, sizeof(ibuf), ifs); /* eat header */
-fgets(ibuf, sizeof(ibuf), ifs); /* ditto */
-}
-else
+if (getifaddrs(&ifap) == -1)
return 0;
-while (fgets(rbuf, sizeof(rbuf), ifs) != NULL) {
-get_name(ibuf, rbuf);
-if (!strcmp(ibuf, "lo"))/* ignore the loopback */
+for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
+strncpy(ibuf, ifa->ifa_name, sizeof(ibuf));
+if (!strncmp(ibuf, "lo", 2))/* ignore the loopback */
continue;
+#if defined(__linux__)
if (!strncmp(ibuf, "sit", 3))/* ignore tunnel devices */
continue;
+#endif
#if defined(WIRELESS)
if (is_raw_80211(ibuf))
continue;
@@ -290,7 +267,7 @@
list = realloc(list, sizeof(char*) * (len + 1));
list[len] = NULL;
}
-fclose (ifs);
+freeifaddrs(ifap);
*ptr = list;
[patch] libdebian-installer poll()
This patch solves a poll() portability issue on kfreebsd-i386, and
shouldn't affect other archs.
I tested this on kfreebsd-i386, solving an infinite loop.
Cheers,
Luca Favatella
Index: debian/changelog
===
--- debian/changelog (.../trunk/packages/libdebian-installer) (revision 59247)
+++ debian/changelog (.../branches/d-i/kfreebsd/packages/libdebian-installer) (revision 59254)
@@ -2,6 +2,10 @@
* Remove a duplicated line from debian/copyright.
+ [ Luca Favatella ]
+ * The poll() system call has EOF-related portability issues. Solve them on
+kfreebsd-i386. Thanks to Colin Watson for the "poll() and EOF" URL.
+
-- Colin Watson Thu, 18 Jun 2009 12:40:52 +0100
libdebian-installer (0.63) unstable; urgency=low
Index: src/exec.c
===
--- src/exec.c (.../trunk/packages/libdebian-installer) (revision 59247)
+++ src/exec.c (.../branches/d-i/kfreebsd/packages/libdebian-installer) (revision 59254)
@@ -164,7 +164,12 @@
for (i = 0; i < pipes; i++)
{
+// References: http://www.greenend.org.uk/rjk/2001/06/poll.html
+#if defined(__FreeBSD_kernel__)
+ if ((pollfds[i].revents & POLLIN) && (! (pollfds[i].revents & POLLHUP)))
+#else
if (pollfds[i].revents & POLLIN)
+#endif
{
while (fgets (line, sizeof (line), files[i].file) != NULL)
{
[patch] installer ufs initrd support (how to create a ufs filesystem as a normal user?)
This patch adds ufs initrd support.
It was in the previous d-i kfreebsd branch, so thanks to Robert Millan.
This code has the bad thing that mkfs.ufs must be executed as root,
and I don't know how to create a ufs filesystem on kfreebsd without
being root.
Comments on how to create a ufs filesystem as a normal user?
I use this on kfreebsd-i386.
Cheers,
Luca Favatella
Index: build/Makefile
===
--- build/Makefile (.../trunk/installer) (revision 59247)
+++ build/Makefile (.../branches/d-i/kfreebsd/installer) (revision 59256)
@@ -119,6 +119,18 @@
(cd $(TREE) && find . | cpio --quiet -o -H newc) >
endef
+define mkfs.ufs
+ fs=`mktemp` ; \
+ dd if=/dev/zero of=$${fs} bs=1M count=16 ; \
+ md=`mdconfig -a -t vnode -f $${fs}` ; \
+ mkfs.ufs /dev/$${md} ; \
+ mnt=`mktemp -d` ; mount /dev/$${md} $${mnt} ; \
+ cp -a $(TREE)/* $${mnt}/ ; \
+ umount $${mnt} ; rmdir $${mnt} ; \
+ mdconfig -d -u $${md} ; \
+ mv $${fs}
+endef
+
define e2fsck
e2fsck -fy
endef
@@ -610,6 +622,10 @@
jffs2) \
$(mkjffs2) $(TEMP_INITRD); \
;; \
+ ufs) \
+ $(mkfs.ufs) $(TEMP)/initrd; \
+ gzip -v9f $(TEMP)/initrd; \
+ ;; \
*) \
echo "Unsupported filesystem type"; \
exit 1 ;; \
Index: debian/changelog
===
--- debian/changelog (.../trunk/installer) (revision 59247)
+++ debian/changelog (.../branches/d-i/kfreebsd/installer) (revision 59256)
@@ -76,6 +76,7 @@
[ Luca Favatella ]
* Handle libc0.1 (GNU/kFreeBSD) and libc0.3 (GNU/Hurd) as libc6/libc6.1.
+ * Add ufs initrd support. Thanks to Robert Millan.
-- Frans Pop Sat, 13 Jun 2009 16:35:46 +0200
Re: [patch] installer ufs initrd support (how to create a ufs filesystem as a normal user?)
On 07/07/2009, Thorsten Glaser wrote:
> Luca Favatella dixit:
>
>>This patch adds ufs initrd support.
>
> 4.2FFS, UFS2, or both?
In the attached second version of the patch, I explicated UFS2.
UFS1 works too, but I chose to introduce only UFS2.
(I'll use UFS2 in kfreebsd-i386 commit in next days/weeks.
I think it is not good to add a feature and not use it.)
See http://svn.debian.org/viewsvn/d-i?view=rev&revision=59261
> I would very much like to be able to install Debian GNU/kFreeBSD on
> 4.2FFS (aka UFS1) filesystems, not just UFS2.
This patch is only about initrd (a.k.a. mfsroot).
I think (I didn't test) you can already install Debian GNU/kFreeBSD on
UFS1 with current hacked sysinstall
(http://glibc-bsd.alioth.debian.org/doc/installing.html).
> bye,
> //mirabilos
Thanks,
Luca Favatella
Index: build/Makefile
===
--- build/Makefile (.../trunk/installer) (revision 59247)
+++ build/Makefile (.../branches/d-i/kfreebsd/installer) (revision 59256)
@@ -119,6 +119,18 @@
(cd $(TREE) && find . | cpio --quiet -o -H newc) >
endef
+define mkfs.ufs2
+ fs=`mktemp` ; \
+ dd if=/dev/zero of=$${fs} bs=1M count=16 ; \
+ md=`mdconfig -a -t vnode -f $${fs}` ; \
+ mkfs.ufs -O2 /dev/$${md} ; \
+ mnt=`mktemp -d` ; mount /dev/$${md} $${mnt} ; \
+ cp -a $(TREE)/* $${mnt}/ ; \
+ umount $${mnt} ; rmdir $${mnt} ; \
+ mdconfig -d -u $${md} ; \
+ mv $${fs}
+endef
+
define e2fsck
e2fsck -fy
endef
@@ -610,6 +622,10 @@
jffs2) \
$(mkjffs2) $(TEMP_INITRD); \
;; \
+ ufs2) \
+ $(mkfs.ufs2) $(TEMP)/initrd; \
+ gzip -v9f $(TEMP)/initrd; \
+ ;; \
*) \
echo "Unsupported filesystem type"; \
exit 1 ;; \
Index: debian/changelog
===
--- debian/changelog (.../trunk/installer) (revision 59247)
+++ debian/changelog (.../branches/d-i/kfreebsd/installer) (revision 59256)
@@ -76,6 +76,7 @@
[ Luca Favatella ]
* Handle libc0.1 (GNU/kFreeBSD) and libc0.3 (GNU/Hurd) as libc6/libc6.1.
+ * Add ufs2 initrd support. Thanks to Robert Millan.
-- Frans Pop Sat, 13 Jun 2009 16:35:46 +0200
Re: [patch] libdebian-installer poll()
On 09/07/2009, Colin Watson wrote:
> On Tue, Jul 07, 2009 at 01:05:41AM +0200, Luca Favatella wrote:
[...]
>> +// References: http://www.greenend.org.uk/rjk/2001/06/poll.html
>
> While // is a valid comment syntax in C99, it wasn't in earlier versions
> of C, and I believe that /* ... */ is still preferred in libd-i.
Fixed in the attached version 2 of the patch.
Thanks,
Luca Favatella
Index: debian/changelog
===
--- debian/changelog (.../trunk/packages/libdebian-installer) (revision 59247)
+++ debian/changelog (.../branches/d-i/kfreebsd/packages/libdebian-installer) (revision 59254)
@@ -2,6 +2,10 @@
* Remove a duplicated line from debian/copyright.
+ [ Luca Favatella ]
+ * The poll() system call has EOF-related portability issues. Solve them on
+kfreebsd-i386. Thanks to Colin Watson for the "poll() and EOF" URL.
+
-- Colin Watson Thu, 18 Jun 2009 12:40:52 +0100
libdebian-installer (0.63) unstable; urgency=low
Index: src/exec.c
===
--- src/exec.c (.../trunk/packages/libdebian-installer) (revision 59247)
+++ src/exec.c (.../branches/d-i/kfreebsd/packages/libdebian-installer) (revision 59254)
@@ -164,7 +164,12 @@
for (i = 0; i < pipes; i++)
{
+/* References: http://www.greenend.org.uk/rjk/2001/06/poll.html */
+#if defined(__FreeBSD_kernel__)
+ if ((pollfds[i].revents & POLLIN) && (! (pollfds[i].revents & POLLHUP)))
+#else
if (pollfds[i].revents & POLLIN)
+#endif
{
while (fgets (line, sizeof (line), files[i].file) != NULL)
{
Re: [patch] libdebian-installer poll()
On 09/07/2009, Luca Favatella wrote: > On 09/07/2009, Colin Watson wrote: [...] >> While // is a valid comment syntax in C99, it wasn't in earlier versions >> of C, and I believe that /* ... */ is still preferred in libd-i. > > Fixed in the attached version 2 of the patch. Committed in svn trunk. Cheers, Luca Favatella -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Re: [patch] netcfg get_all_ifs()
On 06/07/2009, Luca Favatella wrote: > On 06/07/2009, Frans Pop wrote: >> On Monday 06 July 2009, Luca Favatella wrote: >>> This patch substitutes Linux-specific code in get_all_ifs() using >>> getifaddrs(). >> >> -if (!strcmp(ibuf, "lo"))/* ignore the loopback */ >> [...] >> +if (!strncmp(ibuf, "lo", 2))/* ignore the loopback */ >> >> Please do not include random changes that are unrelated to what you >> document in the changelog in the patch. This _does_ change functionality, >> even if in practice it will not make a difference. >> >> The old code would not match on an (unlikely) interface named "loop", the >> new code will. >> >> Cheers, >> FJP > > Solved in the attached version 2 of the patch. I'm not committing this to trunk because could affect d-i on Linux (not in my test). Should I commit this? Cheers, Luca Favatella -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Re: [patch] netcfg get_all_ifs()
On 13/07/2009, Otavio Salvador wrote: > Hello Luca, Hello Otavio. > > On Mon, Jul 13, 2009 at 11:02 AM, Luca Favatella > wrote: >>> Solved in the attached version 2 of the patch. >> >> I'm not committing this to trunk because could affect d-i on Linux >> (not in my test). >> >> Should I commit this? > > Yes, please do; I'll upload netcfg later today so we can figure if > someone find a any regression with it. Done. Thanks, Luca Favatella -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Re: [patch] installer ufs initrd support (how to create a ufs filesystem as a normal user?)
On 07/07/2009, Luca Favatella wrote: > On 07/07/2009, Thorsten Glaser wrote: >> Luca Favatella dixit: >> >>>This patch adds ufs initrd support. >> >> 4.2FFS, UFS2, or both? > > In the attached second version of the patch, I explicated UFS2. > > UFS1 works too, but I chose to introduce only UFS2. > (I'll use UFS2 in kfreebsd-i386 commit in next days/weeks. > I think it is not good to add a feature and not use it.) > See http://svn.debian.org/viewsvn/d-i?view=rev&revision=59261 Committed in svn trunk. Cheers, Luca Favatella -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
[patch] kfreebsd-i386 config
This patch adds kfreebsd-i386 monolithic config files.
Cheers,
Luca Favatella
Index: build/config/kfreebsd-i386.cfg
===
--- build/config/kfreebsd-i386.cfg (.../trunk/installer) (revision 0)
+++ build/config/kfreebsd-i386.cfg (.../branches/d-i/kfreebsd/installer) (revision 59360)
@@ -0,0 +1,42 @@
+MEDIUM_SUPPORTED = monolithic
+
+# The version of the kernel to use.
+KERNELVERSION = 7.2-2-486
+KERNELMAJOR = 7
+KERNEL_FLAVOUR = di
+KERNELNAME = kfreebsd.gz
+KERNELIMAGEVERSION = $(KERNELVERSION)
+
+MKLIBS = mklibs-copy
+INITRD_FS = ufs2
+LSB_DISTRIB_DESCRIPTION="Debian GNU/kFreeBSD installer"
+EXTRAUDEBS =
+
+
+# Miniature CD image using kfreebsd-loader, with only an initrd, no udebs or debs.
+.PHONY: arch_miniiso
+arch_miniiso: $(TEMP_INITRD) $(TEMP_KERNEL) $(TREE)
+ -rm -f $(TEMP_CD_TREE)/*
+ mkdir -p $(TEMP_CD_TREE)/boot/{kernel,defaults}
+
+ cp $(TEMP_KERNEL) $(TEMP_CD_TREE)/boot/kernel/kernel.gz
+ cp $(TEMP_INITRD) $(TEMP_CD_TREE)/boot/mfsroot.gz
+ cp $(TREE)/lib/modules/*/acpi.ko $(TEMP_CD_TREE)/boot/kernel/
+
+ cp /boot/{cdboot,loader*,*.4th} $(TEMP_CD_TREE)/boot/
+ cp /boot/defaults/loader.conf $(TEMP_CD_TREE)/boot/defaults/
+ echo "hw.ata.atapi_dma=0" >> $(TEMP_CD_TREE)/boot/loader.conf # TODO: 1
+ echo "mfsroot_load=\"YES\"" >> $(TEMP_CD_TREE)/boot/loader.conf
+ echo "mfsroot_type=\"mfs_root\"" >> $(TEMP_CD_TREE)/boot/loader.conf
+ echo "mfsroot_name=\"/boot/mfsroot\"" >> $(TEMP_CD_TREE)/boot/loader.conf
+
+ genisoimage -r -J -b boot/cdboot -c boot.cat -no-emul-boot \
+ -o $(TEMP_MINIISO) $(TEMP_CD_TREE)
+
+
+.PHONY: arch_tree
+arch_tree:
+
+
+.PHONY: arch_boot_screens
+arch_boot_screens:
Index: build/config/kfreebsd-i386/monolithic.cfg
===
--- build/config/kfreebsd-i386/monolithic.cfg (.../trunk/installer) (revision 0)
+++ build/config/kfreebsd-i386/monolithic.cfg (.../branches/d-i/kfreebsd/installer) (revision 59360)
@@ -0,0 +1,8 @@
+MEDIA_TYPE = boot image
+
+TARGET = pkg-lists/kernel-module-udebs $(INITRD) $(KERNEL) $(MINIISO)
+EXTRANAME = $(MEDIUM)/
+
+MANIFEST-INITRD = "initrd"
+MANIFEST-KERNEL = "kernel image"
+MANIFEST-MINIISO = "small bootable CD image for network install"
Index: debian/changelog
===
--- debian/changelog (.../trunk/installer) (revision 59351)
+++ debian/changelog (.../branches/d-i/kfreebsd/installer) (revision 59360)
@@ -77,6 +77,7 @@
[ Luca Favatella ]
* Handle libc0.1 (GNU/kFreeBSD) and libc0.3 (GNU/Hurd) as libc6/libc6.1.
* Add ufs2 initrd support. Thanks to Robert Millan.
+ * Add kfreebsd-i386 monolithic config files. Thanks to Robert Millan.
-- Frans Pop Sat, 13 Jun 2009 16:35:46 +0200
Re: [patch] kfreebsd-i386 config
On 15/07/2009, Aurelien Jarno wrote:
[...]
> On Wed, Jul 15, 2009 at 03:08:47PM +0200, Luca Favatella wrote:
[...]
>> +KERNELVERSION = 7.2-2-486
>
> I think it should be 7.2-1-486 as we haven't bumped the ABI on
> kfreebsd 7.2 yet.
Fixed in the attached version 2 of the patch.
[...]
>> +echo "hw.ata.atapi_dma=0" >>
>> $(TEMP_CD_TREE)/boot/loader.conf # TODO: 1
>
> Is it still needed? I think it was there to workaround a QEMU bug.
In fact. It is still needed. Please see:
http://svn.debian.org/viewsvn/d-i?view=rev&revision=59359
Cheers,
Luca Favatella
Index: build/config/kfreebsd-i386.cfg
===
--- build/config/kfreebsd-i386.cfg (.../trunk/installer) (revision 0)
+++ build/config/kfreebsd-i386.cfg (.../branches/d-i/kfreebsd/installer) (revision 59360)
@@ -0,0 +1,42 @@
+MEDIUM_SUPPORTED = monolithic
+
+# The version of the kernel to use.
+KERNELVERSION = 7.2-1-486
+KERNELMAJOR = 7
+KERNEL_FLAVOUR = di
+KERNELNAME = kfreebsd.gz
+KERNELIMAGEVERSION = $(KERNELVERSION)
+
+MKLIBS = mklibs-copy
+INITRD_FS = ufs2
+LSB_DISTRIB_DESCRIPTION="Debian GNU/kFreeBSD installer"
+EXTRAUDEBS =
+
+
+# Miniature CD image using kfreebsd-loader, with only an initrd, no udebs or debs.
+.PHONY: arch_miniiso
+arch_miniiso: $(TEMP_INITRD) $(TEMP_KERNEL) $(TREE)
+ -rm -f $(TEMP_CD_TREE)/*
+ mkdir -p $(TEMP_CD_TREE)/boot/{kernel,defaults}
+
+ cp $(TEMP_KERNEL) $(TEMP_CD_TREE)/boot/kernel/kernel.gz
+ cp $(TEMP_INITRD) $(TEMP_CD_TREE)/boot/mfsroot.gz
+ cp $(TREE)/lib/modules/*/acpi.ko $(TEMP_CD_TREE)/boot/kernel/
+
+ cp /boot/{cdboot,loader*,*.4th} $(TEMP_CD_TREE)/boot/
+ cp /boot/defaults/loader.conf $(TEMP_CD_TREE)/boot/defaults/
+ echo "hw.ata.atapi_dma=0" >> $(TEMP_CD_TREE)/boot/loader.conf # TODO: 1
+ echo "mfsroot_load=\"YES\"" >> $(TEMP_CD_TREE)/boot/loader.conf
+ echo "mfsroot_type=\"mfs_root\"" >> $(TEMP_CD_TREE)/boot/loader.conf
+ echo "mfsroot_name=\"/boot/mfsroot\"" >> $(TEMP_CD_TREE)/boot/loader.conf
+
+ genisoimage -r -J -b boot/cdboot -c boot.cat -no-emul-boot \
+ -o $(TEMP_MINIISO) $(TEMP_CD_TREE)
+
+
+.PHONY: arch_tree
+arch_tree:
+
+
+.PHONY: arch_boot_screens
+arch_boot_screens:
Index: build/config/kfreebsd-i386/monolithic.cfg
===
--- build/config/kfreebsd-i386/monolithic.cfg (.../trunk/installer) (revision 0)
+++ build/config/kfreebsd-i386/monolithic.cfg (.../branches/d-i/kfreebsd/installer) (revision 59360)
@@ -0,0 +1,8 @@
+MEDIA_TYPE = boot image
+
+TARGET = pkg-lists/kernel-module-udebs $(INITRD) $(KERNEL) $(MINIISO)
+EXTRANAME = $(MEDIUM)/
+
+MANIFEST-INITRD = "initrd"
+MANIFEST-KERNEL = "kernel image"
+MANIFEST-MINIISO = "small bootable CD image for network install"
Index: debian/changelog
===
--- debian/changelog (.../trunk/installer) (revision 59351)
+++ debian/changelog (.../branches/d-i/kfreebsd/installer) (revision 59360)
@@ -77,6 +77,7 @@
[ Luca Favatella ]
* Handle libc0.1 (GNU/kFreeBSD) and libc0.3 (GNU/Hurd) as libc6/libc6.1.
* Add ufs2 initrd support. Thanks to Robert Millan.
+ * Add kfreebsd-i386 monolithic config files. Thanks to Robert Millan.
-- Frans Pop Sat, 13 Jun 2009 16:35:46 +0200
[patch] kfreebsd-i386 kernel udeb: fix ABI and fix dependency version
This patch fixes in the kfreebsd-i386 kernel udeb * ABI (see also [0]) * a dependency version Sorry for writing one patch and one mail for two fixes, but I decided to do so because the fixes are very simple. Cheers, Luca Favatella [0] http://lists.debian.org/debian-boot/2009/07/msg00346.html Index: kfreebsd-kernel-di-i386/debian/control.stub === --- kfreebsd-kernel-di-i386/debian/control.stub (.../trunk/packages/kernel) (revision 59351) +++ kfreebsd-kernel-di-i386/debian/control.stub (.../branches/d-i/kfreebsd/packages/kernel) (revision 59363) @@ -3,4 +3,4 @@ Priority: optional Maintainer: Debian Install System Team Uploaders: Otavio Salvador -Build-Depends: kernel-wedge (>= 2.22) +Build-Depends: kernel-wedge (>= 2.59) Index: kfreebsd-kernel-di-i386/kernel-versions === --- kfreebsd-kernel-di-i386/kernel-versions (.../trunk/packages/kernel) (revision 59351) +++ kfreebsd-kernel-di-i386/kernel-versions (.../branches/d-i/kfreebsd/packages/kernel) (revision 59363) @@ -1,2 +1,2 @@ # arch version flavour installedname suffix build-depends -kfreebsd-i386 7.2-2 486 7.2-1-486 - kfreebsd-image-7.2-1-486 +kfreebsd-i386 7.2-1 486 7.2-1-486 - kfreebsd-image-7.2-1-486
Re: [patch] kfreebsd-i386 config
On 16/07/2009, Luca Favatella wrote: > On 15/07/2009, Aurelien Jarno wrote: > [...] >> On Wed, Jul 15, 2009 at 03:08:47PM +0200, Luca Favatella wrote: > [...] >>> +KERNELVERSION = 7.2-2-486 >> >> I think it should be 7.2-1-486 as we haven't bumped the ABI on >> kfreebsd 7.2 yet. > > Fixed in the attached version 2 of the patch. Please see also http://lists.debian.org/debian-boot/2009/07/msg00365.html Cheers, Luca Favatella -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Re: [patch] kfreebsd-i386 kernel udeb: fix ABI and fix dependency version
On 17/07/2009, Colin Watson wrote: > On Thu, Jul 16, 2009 at 11:47:18AM +0200, Luca Favatella wrote: >> This patch fixes in the kfreebsd-i386 kernel udeb >> * ABI (see also [0]) >> * a dependency version >> >> Sorry for writing one patch and one mail for two fixes, but I decided >> to do so because the fixes are very simple. > > Looks fine; OK to commit. Committed to trunk. Thanks, Luca Favatella -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Re: [patch] kfreebsd-i386 config
On 16/07/2009, Luca Favatella wrote: > On 15/07/2009, Aurelien Jarno wrote: > [...] >> On Wed, Jul 15, 2009 at 03:08:47PM +0200, Luca Favatella wrote: > [...] >>> +KERNELVERSION = 7.2-2-486 >> >> I think it should be 7.2-1-486 as we haven't bumped the ABI on >> kfreebsd 7.2 yet. > > Fixed in the attached version 2 of the patch. Committed to trunk, this should not be able to cause problems to GNU/Linux builds. Cheers, Luca Favatella -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
kFreeBSD progress report week 8
In the past two weeks I focused on getting network configuration working in debian-installer (d-i), without success. I skipped the keyboard layout selection, because not a top priority, and I didn't reach udeb download (and installation). I focused on network configuration in d-i, mostly done by netcfg [din0]. I disabled unuseful udebs, to semplify debugging; in particular, I disabled the ethdetect one [din1], concentrating on those cards whose driver is automatically detected and loaded by the kernel (e.g. NE2000, as QEMU's one). I made a little portability fix in netcfg [din2] about a Linux specific PCMCIA file. While debugging netcfg, I discovered that "/var/log/syslog" is not created, even manually executing syslogd. Currently, in d-i, BusyBox syslogd is used. Even without syslogd working, I managed to go forward in netcfg debug manually running "dhclient ed0" [din3] (thanks to Julián Moreno Patiño): the "ip" command is not found, because the dhclient-script used in the dhcp3-client udeb is Linux specific; on the deb package, there is a different script for GNU/kFreeBSD and GNU/Linux, but the GNU/kFreeBSD version needs "ifconfig" and "route". I considered porting and switching to BusyBox udhcpc. I also worked on * BusyBox + realizing there is a FreeBSD port [bb0] + asking upstream [bb1] for partially reverting a commit, proposing a patch rejected [bb2] because - breaking GNU/Linux build - against BusyBox policy about "#define"s, as I discovered later [bb3] + moving to [bb4] some patches: - those from the previous efforts on version 1.01 [bb6], merging them in [bb5] - those from FreeBSD [bb0], against version 1.13, almost useless; in particular @ init is disabled @ syslogd is enabled but not patched (so not working, I think) - those I wrote in previous weeks [bb7] (against version 1.13), reviewing and cleaning most of them; these [bb5] are the recommended patches to use + looking for Linux-specific code in syslogd (and logger), without success * enabling auxiliary consoles (alt-fX) in d-i [dic0] (read the commit log) * merging some patches to d-i trunk + committing already proposed patches - add cons25 terminfo file [dip0] - more fine-grained wireless building and linking in netcfg [dip1] + proposing and committing new patches - substitute Linux-specific code in get_all_ifs() using getifaddrs() [dip2] - poll() portability issue [dip3] - add ufs2 initrd support [dip4]; mkfs.ufs2 needs root rights, perhaps NetBSD makefs (or its FreeBSD [dip4_0] or MirBSD version) could be useful to run it as a normal user - fix in the kfreebsd-i386 kernel udeb ABI and a dependency version [dip5] - add kfreebsd-i386 monolithic config files [dip6] + proposing new patches (without committing them yet) - generalize rootskel splitting Linux specific stuff [dip7] (unblocked by [dip7_0]) To quickly test all this * download the mini.iso cd at [test0], built from current d-i kfreebsd branch [test1] * boot it in your favourite virtual machine + if it is qemu, "qemu -boot d -cdrom mini.iso" will suffice In the next two weeks I should (still) * get network configuration working * get udeb download and installation working For that I should work on * BusyBox + udhcpc + syslogd + understanding if [todo0] fixes some known problems or is unuseful * netcfg + network interface detected twice + filtering lo0 * rootskel + clean [dic0] for merging to d-i trunk Luca Favatella [din0] http://packages.debian.org/sid/netcfg [din1] http://packages.debian.org/sid/ethdetect [din2] http://svn.debian.org/viewsvn/d-i?view=rev&revision=59287 [din3] http://svn.debian.org/viewsvn/d-i/trunk/packages/netcfg/dhcp.c?revision=58009&view=markup [bb0] http://www.freebsd.org/cgi/ports.cgi?query=busybox&stype=all [bb1] http://lists.busybox.net/pipermail/busybox/2009-July/069902.html [bb2] http://lists.busybox.net/pipermail/busybox/2009-July/069914.html [bb3] http://lists.busybox.net/pipermail/busybox/2009-July/069938.html [bb4] http://svn.debian.org/viewsvn/d-i/people/slackydeb/kfreebsd/busybox/ [bb5] http://svn.debian.org/viewsvn/d-i/people/slackydeb/kfreebsd/busybox/1.13/debian/ [bb6] http://glibc-bsd.alioth.debian.org/patches/ [bb7] http://slackydeb.blogspot.com/2009/05/busybox-status-on-gnukfreebsd.html [dic0] http://svn.debian.org/viewsvn/d-i/branches/d-i/kfreebsd/packages/rootskel/src/etc/inittab?revision=59364&view=markup [dip0] http://lists.debian.org/debian-boot/2009/07/msg00051.html [dip1] http://lists.debian.org/debian-boot/2009/07/msg00052.html [dip2] http://lists.debian.org/debian-boot/2009/07/msg00142.html [dip3] http://lists.debian.org/debian-boot/2009/07/msg00149.html [dip4] http://lists.debian.org/debian-boot/2009/07/msg00150.html [dip4_0] http://svn.freebsd.org/viewvc/base/head/usr.sbin/makefs/ [dip5] http://lists.debian.org/debian-boot/2009/07/msg00365.html [dip6] http://lists
Re: kFreeBSD progress report week 8
On 20/07/2009, Luca Favatella wrote: [...] > While debugging netcfg, I discovered that "/var/log/syslog" is not > created, even manually executing syslogd. Currently, in d-i, BusyBox > syslogd is used. My mentor solved this. See: http://svn.debian.org/viewsvn/d-i?view=rev&revision=59407 > Even without syslogd working, I managed to go forward in netcfg debug > manually running "dhclient ed0" [din3] (thanks to Julián Moreno > Patiño): the "ip" command is not found, because the dhclient-script > used in the dhcp3-client udeb is Linux specific; on the deb package, > there is a different script for GNU/kFreeBSD and GNU/Linux, but the > GNU/kFreeBSD version needs "ifconfig" and "route". I considered > porting and switching to BusyBox udhcpc. [...] > In the next two weeks I should (still) > * get network configuration working > * get udeb download and installation working > > For that I should work on > * BusyBox > + udhcpc It seems that all DHCP clients (dhcp3-client and busybox udhcpc) need other binaries, i.e. * "ip", or * "ifconfig" + "route" I think the right way to get things work should be having a working BusyBox "ip" command on GNU/kFreeBSD. Any comment? Help on this, i.e. porting Busybox "ip" on GNU/kFreeBSD, is highly appreciated. It should be possible to test it (the deb, not the udeb) in the main system, only hacking BusyBox package, without having to build a d-i image. > + syslogd No need to work on syslogd, as I wrote above. Cheers, Luca Favatella -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Re: kFreeBSD progress report week 8
On 20/07/2009, Petr Salinger wrote: >> It seems that all DHCP clients (dhcp3-client and busybox udhcpc) need >> other binaries, i.e. >> * "ip", or >> * "ifconfig" + "route" >> >> I think the right way to get things work should be having a working >> BusyBox "ip" command on GNU/kFreeBSD. Any comment? Aurelien Jarno told me that "route" is also needed, not only "ip". BusyBox "ip" + "route" should be the long term solution. > Wouldn't be possible somehow create and use udeb from freebsd-net-tools ? > I.e. udebs from freebsd-utils and freebsd-libs source packages. This should be the short term solution. Help on creating freebsd-net-tools udeb is appreciated. > Petr Cheers, Luca Favatella -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Re: kFreeBSD progress report week 8
On 20/07/2009, Ludovic Courtès wrote: > Hi, Hi. > > Luca Favatella writes: > > [...] > >> on the deb package, there is a different script for GNU/kFreeBSD and >> GNU/Linux, but the GNU/kFreeBSD version needs "ifconfig" and >> "route". I considered porting and switching to BusyBox udhcpc. > > (I haven't studied the question in depth, so pardon me if this remark is > off.) No problem, thanks for your feeback. > > Did you consider using GNU Inetutils as a (hopefully) portable network > tool set for all the GNU/* variants? It seems it is not enough. It has only ifconfig http://packages.debian.org/sid/kfreebsd-i386/inetutils-tools/filelist > > Thanks, > Ludo'. Thanks, Luca Favatella -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
[patch] kfreebsd S10syslog
This patch adds GNU/kFreeBSD S10syslog. It is different from the GNU/Linux one not only because not calling klogd, but also for the absence of a Linux specific command (modprobe unix...). I tested this on GNU/kFreeBSD. It should not affect GNU/Linux. Cheers, Luca Favatella Index: debian/changelog === --- debian/changelog (.../trunk/packages/rootskel) (revision 59506) +++ debian/changelog (.../branches/d-i/kfreebsd/packages/rootskel) (revision 59522) @@ -5,6 +5,7 @@ [ Luca Favatella ] * Generalize code splitting Linux specific stuff. * GNU/kFreeBSD does not need klibc and udev. + * Add GNU/kFreeBSD S10syslog. -- Colin Watson Tue, 14 Jul 2009 15:43:38 +0100 Index: src/lib/debian-installer-startup.d/S10syslog-kfreebsd === --- src/lib/debian-installer-startup.d/S10syslog-kfreebsd (.../trunk/packages/rootskel) (revision 0) +++ src/lib/debian-installer-startup.d/S10syslog-kfreebsd (.../branches/d-i/kfreebsd/packages/rootskel) (revision 59522) @@ -0,0 +1,3 @@ +echo -n "Starting system log daemon: " +/sbin/syslogd -m 0 -O /var/log/syslog -S +echo "syslogd."
Re: [patch] kfreebsd S10syslog
On 21/07/2009, Luca Favatella wrote: > This patch adds GNU/kFreeBSD S10syslog. This is now unuseful. See also http://svn.debian.org/viewsvn/d-i?view=rev&revision=59558 Cheers, Luca Favatella -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Re: d-i Kfreebsd work
On 22/07/2009, Julián Moreno Patiño wrote: > Hi All =D, > > I Find some bugs on di kfreebsd: It should work now. (10:55:13) aurel32: slackydeb: with the current SVN (after rebuilding busybox, netcfg and dhcp3-client), it should work (10:55:22) aurel32: the route message is still there, but can be ignored safely for now I'll not be able to test this by 4 hours. Cheers, Luca Favatella -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
[patch] add GNU/kFreeBSD fstab and init
This patch adds GNU/kFreeBSD /etc/fstab and /sbin/init. Please carefully review it. I'm proposing both together because they are closely related. This patch should not affect GNU/Linux builds and has been in the kfreebsd d-i branch for a while. Cheers, Luca Favatella -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Re: [patch] add GNU/kFreeBSD fstab and init
On 22/07/2009, Luca Favatella wrote: > This patch adds GNU/kFreeBSD /etc/fstab and /sbin/init. > Please carefully review it. Now the patch should be really attached. Sorry for the noise. Index: debian/changelog === --- debian/changelog (.../trunk/packages/rootskel) (revision 59603) +++ debian/changelog (.../branches/d-i/kfreebsd/packages/rootskel) (revision 59603) @@ -6,6 +6,8 @@ [ Luca Favatella ] * Generalize code splitting Linux specific stuff. * GNU/kFreeBSD does not need klibc and udev. + * Add GNU/kFreeBSD /etc/fstab. + * Add GNU/kFreeBSD /sbin/init. [ Otavio Salvador ] * Unix socket support is built-in since long ago so we don't need to Index: src/etc/fstab-kfreebsd === --- src/etc/fstab-kfreebsd (.../trunk/packages/rootskel) (revision 0) +++ src/etc/fstab-kfreebsd (.../branches/d-i/kfreebsd/packages/rootskel) (revision 59603) @@ -0,0 +1 @@ +none /proc linprocfs defaults0 0 Index: src/sbin/init-kfreebsd === --- src/sbin/init-kfreebsd (.../trunk/packages/rootskel) (revision 0) +++ src/sbin/init-kfreebsd (.../branches/d-i/kfreebsd/packages/rootskel) (revision 59603) @@ -0,0 +1,24 @@ +#!/bin/sh +# Set up filesystem as root and pivot into it. + +export PATH=/sbin:/bin:/usr/sbin:/usr/bin +exec < /dev/console > /dev/console 2> /dev/console +export TERM=cons25 + +export BOOT_DEBUG=2 + +trap "echo \"Something wicked happened. Press enter for rescue shell.\" ; read NULL ; exec sh" 0 +set -e + +. /lib/debian-installer/init-debug +debugshell "just booted" + +echo "Setting up filesystem, please wait ..." +mount -o update,rw -t ufs /dev/md0 / +mount -t devfs devfs /dev/ +mount /proc +ln -s /var/run/log /dev/log + +# Close all open files on the initrd, and run busybox init. +debugshell "before init" +exec /usr/sbin/chroot . /bin/busybox init < /dev/console > /dev/console 2>&1 Property changes on: src/sbin/init-kfreebsd ___ Added: svn:executable + *
[patch] add GNU/kFreeBSD inittab
This patch adds GNU/kFreeBSD /etc/inittab, considering /dev/ttyv[1-3] instead of /dev/tty[2-4] (as on GNU/Linux). Using this patch kfreebsd d-i has alt-f[1-4] working. This patch has been in kfreebsd d-i branch for a while. Cheers, Luca Favatella Index: debian/changelog === --- debian/changelog (.../trunk/packages/rootskel) (revision 59602) +++ debian/changelog (.../branches/d-i/kfreebsd/packages/rootskel) (revision 59602) @@ -6,6 +6,8 @@ [ Luca Favatella ] * Generalize code splitting Linux specific stuff. * GNU/kFreeBSD does not need klibc and udev. + * Add GNU/kFreeBSD /etc/inittab, considering /dev/ttyv[1-3] instead of +/dev/tty[2-4] (as on GNU/Linux). [ Otavio Salvador ] * Unix socket support is built-in since long ago so we don't need to Index: src/etc/inittab-kfreebsd === --- src/etc/inittab-kfreebsd (.../trunk/packages/rootskel) (revision 0) +++ src/etc/inittab-kfreebsd (.../branches/d-i/kfreebsd/packages/rootskel) (revision 59602) @@ -0,0 +1,21 @@ +# /etc/inittab +# busybox init configuration for debian-installer + +# main rc script +::sysinit:/sbin/reopen-console /sbin/debian-installer-startup + +# main setup program +::respawn:/sbin/reopen-console /sbin/debian-installer + +# convenience shells +ttyv1::askfirst:-/bin/sh +ttyv2::askfirst:-/bin/sh + +# logging +ttyv3::respawn:/usr/bin/tail -f /var/log/syslog + +# Stuff to do before rebooting +::ctrlaltdel:/sbin/shutdown > /dev/null 2>&1 + +# re-exec init on receipt of SIGHUP/SIGUSR1 +::restart:/sbin/init
[patch] add GNU/kFreeBSD detect-console
This patch adds GNU/kFreeBSD /lib/debian-installer/detect-console. It needs the BusyBox "tty" command (it builds on GNU/kFreeBSD i386 with no patches more needed). Please carefully review this, because I used it only /dev/ttyv console. Cheers, Luca Favatella Index: debian/changelog === --- debian/changelog (.../trunk/packages/rootskel) (revision 59604) +++ debian/changelog (.../branches/d-i/kfreebsd/packages/rootskel) (revision 59604) @@ -6,6 +6,7 @@ [ Luca Favatella ] * Generalize code splitting Linux specific stuff. * GNU/kFreeBSD does not need klibc and udev. + * Add GNU/kFreeBSD /lib/debian-installer/detect-console. [ Otavio Salvador ] * Unix socket support is built-in since long ago so we don't need to Index: src/lib/debian-installer/detect-console-kfreebsd === --- src/lib/debian-installer/detect-console-kfreebsd (.../trunk/packages/rootskel) (revision 0) +++ src/lib/debian-installer/detect-console-kfreebsd (.../branches/d-i/kfreebsd/packages/rootskel) (revision 59604) @@ -0,0 +1,15 @@ +if [ -z "$TERM_TYPE" ]; then + case `tty` in + /dev/console|/dev/cuaa[0-f]*) + TERM_TYPE=serial + ;; + /dev/ttyv[0-f]*) + TERM_TYPE=virtual + ;; + /dev/ttyp[0-f]*) + TERM_TYPE=pts + ;; + esac +fi + +export TERM_TYPE
Re: [patch] add GNU/kFreeBSD fstab and init
On 22/07/2009, Otavio Salvador wrote: > Hello, > > On Wed, Jul 22, 2009 at 2:26 PM, Luca Favatella wrote: >> On 22/07/2009, Luca Favatella wrote: >>> This patch adds GNU/kFreeBSD /etc/fstab and /sbin/init. >>> Please carefully review it. [...] > Fine with me; the only thing I'd do different is to merge both > changelog lines in a single one. Fixed in the attached version 2 of the patch. Cheers, Luca Favatella Index: debian/changelog === --- debian/changelog (.../trunk/packages/rootskel) (revision 59603) +++ debian/changelog (.../branches/d-i/kfreebsd/packages/rootskel) (revision 59603) @@ -6,6 +6,7 @@ [ Luca Favatella ] * Generalize code splitting Linux specific stuff. * GNU/kFreeBSD does not need klibc and udev. + * Add GNU/kFreeBSD /etc/fstab and /sbin/init. [ Otavio Salvador ] * Unix socket support is built-in since long ago so we don't need to Index: src/etc/fstab-kfreebsd === --- src/etc/fstab-kfreebsd (.../trunk/packages/rootskel) (revision 0) +++ src/etc/fstab-kfreebsd (.../branches/d-i/kfreebsd/packages/rootskel) (revision 59603) @@ -0,0 +1 @@ +none /proc linprocfs defaults0 0 Index: src/sbin/init-kfreebsd === --- src/sbin/init-kfreebsd (.../trunk/packages/rootskel) (revision 0) +++ src/sbin/init-kfreebsd (.../branches/d-i/kfreebsd/packages/rootskel) (revision 59603) @@ -0,0 +1,24 @@ +#!/bin/sh +# Set up filesystem as root and pivot into it. + +export PATH=/sbin:/bin:/usr/sbin:/usr/bin +exec < /dev/console > /dev/console 2> /dev/console +export TERM=cons25 + +export BOOT_DEBUG=2 + +trap "echo \"Something wicked happened. Press enter for rescue shell.\" ; read NULL ; exec sh" 0 +set -e + +. /lib/debian-installer/init-debug +debugshell "just booted" + +echo "Setting up filesystem, please wait ..." +mount -o update,rw -t ufs /dev/md0 / +mount -t devfs devfs /dev/ +mount /proc +ln -s /var/run/log /dev/log + +# Close all open files on the initrd, and run busybox init. +debugshell "before init" +exec /usr/sbin/chroot . /bin/busybox init < /dev/console > /dev/console 2>&1 Property changes on: src/sbin/init-kfreebsd ___ Added: svn:executable + *
Re: [patch] add GNU/kFreeBSD inittab
On 22/07/2009, Otavio Salvador wrote: > Hello > > On Wed, Jul 22, 2009 at 2:53 PM, Luca Favatella wrote: >> This patch adds GNU/kFreeBSD /etc/inittab, considering /dev/ttyv[1-3] >> instead of /dev/tty[2-4] (as on GNU/Linux). [...] > Fine with me :-D Committed to trunk. Thanks, Luca Favatella -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Re: [patch] add GNU/kFreeBSD fstab and init
On 22/07/2009, Luca Favatella wrote: > On 22/07/2009, Otavio Salvador wrote: >> Hello, >> >> On Wed, Jul 22, 2009 at 2:26 PM, Luca Favatella >> wrote: >>> On 22/07/2009, Luca Favatella wrote: >>>> This patch adds GNU/kFreeBSD /etc/fstab and /sbin/init. >>>> Please carefully review it. > [...] >> Fine with me; the only thing I'd do different is to merge both >> changelog lines in a single one. > > Fixed in the attached version 2 of the patch. Committed to trunk. Thanks, Luca Favatella -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Re: [patch] add GNU/kFreeBSD detect-console
On 22/07/2009, Otavio Salvador wrote: > Hello, > > On Wed, Jul 22, 2009 at 3:01 PM, Luca Favatella wrote: >> This patch adds GNU/kFreeBSD /lib/debian-installer/detect-console. [...] > Fine with me. Committed to trunk. Thanks, Luca Favatella -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
[patch] generalize loopback network interface name
Loopback network interface name is lo on GNU/Linux and lo0 on GNU/kFreeBSD.
This patch generalizes it with a macro.
Tested on GNU/kFreeBSD.
Could affect GNU/Linux (but it shouldn't).
Cheers,
Luca Favatella
Index: debian/changelog
===
--- debian/changelog (.../trunk/packages/netcfg) (revision 59616)
+++ debian/changelog (.../branches/d-i/kfreebsd/packages/netcfg) (revision 59625)
@@ -1,3 +1,11 @@
+netcfg (1.52) UNRELEASED; urgency=low
+
+ [ Aurelien Jarno ]
+ * Loopback network interface name is lo on GNU/Linux and lo0 on
+GNU/kFreeBSD; generalize it with a macro.
+
+ -- Luca Favatella Thu, 23 Jul 2009 00:44:44 +0200
+
netcfg (1.51) unstable; urgency=low
[ Luca Favatella ]
Index: netcfg-common.c
===
--- netcfg-common.c (.../trunk/packages/netcfg) (revision 59616)
+++ netcfg-common.c (.../branches/d-i/kfreebsd/packages/netcfg) (revision 59625)
@@ -46,6 +46,12 @@
#include
+#ifdef __FreeBSD_kernel__
+#define LO_IF "lo0"
+#else
+#define LO_IF "lo"
+#endif
+
/* Set if there is currently a progress bar displayed. */
int netcfg_progress_displayed = 0;
@@ -685,8 +691,8 @@
if ((fp = file_open(INTERFACES_FILE, "w"))) {
fprintf(fp, HELPFUL_COMMENT);
fprintf(fp, "\n# The loopback network interface\n");
-fprintf(fp, "auto lo\n");
-fprintf(fp, "iface lo inet loopback\n");
+fprintf(fp, "auto "LO_IF"\n");
+fprintf(fp, "iface "LO_IF" inet loopback\n");
fclose(fp);
}
}
@@ -707,8 +713,8 @@
if ((fp = file_open(INTERFACES_FILE, "w"))) {
fprintf(fp, HELPFUL_COMMENT);
fprintf(fp, "\n# The loopback network interface\n");
-fprintf(fp, "auto lo\n");
-fprintf(fp, "iface lo inet loopback\n");
+fprintf(fp, "auto "LO_IF"\n");
+fprintf(fp, "iface "LO_IF" inet loopback\n");
fclose(fp);
}
Re: [patch] generalize loopback network interface name
On 23/07/2009, Otavio Salvador wrote: > Hello, > > On Wed, Jul 22, 2009 at 7:58 PM, Luca Favatella wrote: >> Loopback network interface name is lo on GNU/Linux and lo0 on >> GNU/kFreeBSD. >> This patch generalizes it with a macro. [...] > Please go ahead and commit it. Committed to trunk. Thanks, Luca Favatella -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
[patch][parted] debian/rules: Enable device-mapper only on Linux
Hello, Otavio.
Please consider applying this patch to Debian parted.
Feel free to change variable name.
I tested this on GNU/kFreeBSD with success.
This could affect GNU/Linux (but it shouldn't).
Cheers,
Luca Favatella
From 50216d2c337a4e02649479058978ff0010d68583 Mon Sep 17 00:00:00 2001
From: Luca Favatella
Date: Wed, 29 Jul 2009 19:31:53 +0200
Subject: [PATCH] debian/rules: Enable device-mapper only on Linux.
Signed-off-by: Luca Favatella
---
debian/changelog |1 +
debian/rules | 18 +++---
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d1d975e..eb03481 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ parted (1.8.8.git.2009.07.19-3) UNRELEASED; urgency=low
[ Luca Favatella ]
* control.in: Remove libdevmapper-dev as build-dependency on GNU/kFreeBSD.
+ * debian/rules: Enable device-mapper only on Linux.
-- Otavio Salvador Fri, 24 Jul 2009 13:35:48 -0300
diff --git a/debian/rules b/debian/rules
index 5a0b853..76e60ed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -73,6 +73,10 @@ ifeq (, $(DEB_BUILD_ARCH))
DEB_BUILD_ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
endif
+ifeq (, $(DEB_BUILD_ARCH_OS))
+DEB_BUILD_ARCH_OS = $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
+endif
+
ifeq (, $(DEB_BUILD_GNU_TYPE))
DEB_BUILD_GNU_TYPE = $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
endif
@@ -118,6 +122,13 @@ endif
CFLAGS += -fgnu89-inline
UDEB_CFLAGS += -fgnu89-inline
+# Enable device-mapper only on Linux
+ifeq (linux, $(DEB_BUILD_ARCH_OS))
+ CONFDEVMAPPER = --enable-device-mapper
+else
+ CONFDEVMAPPER = --disable-device-mapper
+endif
+
# This builds a substitution list for sed based on the SUBSTS variable
# and the variables whose names SUBSTS contains ...
SUBSTLIST = $(foreach subst, $(SUBSTS), s/@$(subst)@/$($(subst))/g;)
@@ -169,7 +180,7 @@ endif
--sbindir=/sbin --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info --enable-shared \
--build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \
- --enable-device-mapper \
+ $(CONFDEVMAPPER) \
$(CONFFLAGS)
build-udeb/config.status: patch-stamp
@@ -180,7 +191,7 @@ build-udeb/config.status: patch-stamp
--sbindir=/sbin --libdir=/lib --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info --enable-shared --disable-static \
--build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \
- --without-readline --enable-device-mapper \
+ --without-readline $(CONFDEVMAPPER) \
$(CONFFLAGS)
build-dbg/config.status: patch-stamp
@@ -190,7 +201,8 @@ build-dbg/config.status: patch-stamp
# Add here commands to configure the package.
cd build-dbg && CFLAGS="-g $(CFLAGS)" ../configure --prefix=/usr \
--enable-mtrace --disable-shared $(CONFFLAGS) \
- --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+ --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \
+ $(CONFDEVMAPPER)
touch $@
--
1.6.3.1
kFreeBSD progress report week 10
In the past two weeks I got network configuration and udeb download working in the GNU/kFreeBSD debian-installer (d-i) port. I also started working on disk partitioning. Network configuration is working, even if with some short term solutions, i.e. using * "ifconfig" and "route" from freebsd-net-tools-udeb instead of "ip" from BusyBox + the patch to create the freebsd-net-tools-udeb is at [0.0] * ISC DHCP client instead of BusyBox udhcpc + substituting dhclient-script.udeb with that from [0.1] is needed Thanks to my mentor (Aurelien Jarno) and to Julián Moreno Patiño. My mentor also solved issues on * BusyBox syslogd + understanding why it was not working on GNU/kFreeBSD [1.0] * netcfg + filtering loopback interfaces [1.1] + fixing the multiple detection of network interfaces [1.2] * adding netboot d-i configuration files [1.3] About disk partitioning, I started porting GNU Parted. I initially had some problems with its build environment. I refreshed the previous kfreebsd-gnu patch in the Debian package [2.0], splitting and updating it [2.1]. I started to merge this work "upstream" [2.2] [2.3]. Following instructions at [2.4], parted builds. It segfaults when executed; if you want to test/debug it, you find the debs at [2.5] [2.6] [2.7] [2.8] I also worked on * doc + HOWTO build BusyBox package on Debian GNU/kFreeBSD [3.0] + HOWTO build debian-installer monolithic mini.iso on Debian GNU/kFreeBSD [3.1] * merging some patches to d-i trunk + committing already proposed patches - generalize rootskel splitting Linux specific stuff [3.2] + proposing and committing new patches - rootskel: add GNU/kFreeBSD inittab [3.3] - rootskel: add GNU/kFreeBSD fstab and init [3.4] - rootskel: add GNU/kFreeBSD detect-console [3.5] - netcfg: generalize loopback network interface name [3.6] I have not been able to build iso images due to a misconfiguration on ftp.debian.org; I will provide them when the problem is fixed. In the next two weeks I should get disk partitioning working. If possible, I should also work on * BusyBox + understanding if [4.0] fixes some known problems or is unuseful (this task is inherited from the previous progress report [4.1]) * makefs Debian package [4.2] (thanks to Thorsten Glaser) + testing it + trying to use it to create ufs2 initrd as normal user in [4.3] Luca Favatella [0.0] http://svn.debian.org/viewsvn/d-i/people/slackydeb/kfreebsd/d-i/freebsd-net-tools-udeb.diff [0.1] http://svn.debian.org/viewsvn/d-i/people/slackydeb/kfreebsd/d-i/dhclient-script.udeb [1.0] http://svn.debian.org/viewsvn/d-i?view=rev&revision=59407 [1.1] http://svn.debian.org/viewsvn/d-i?view=rev&revision=59550 [1.2] http://svn.debian.org/viewsvn/d-i?view=rev&revision=59556 [1.3] http://svn.debian.org/viewsvn/d-i?view=rev&revision=59581 [2.0] http://git.debian.org/?p=parted/debian/parted.git;a=blob;f=debian/patches/kfreebsd-gnu.dpatch;hb=81343b304f6c6dbe42a0a6178d6864ae3cda0b36 [2.1] http://svn.debian.org/viewsvn/d-i/people/slackydeb/kfreebsd/d-i/parted/unstable/ [2.2] http://lists.debian.org/debian-boot/2009/07/msg00756.html [2.3] http://lists.debian.org/debian-boot/2009/07/msg00813.html [2.4] http://slackydeb.blogspot.com/2009/07/howto-build-parted-on-debian.html [2.5] http://slackydeb.altervista.org/files/debian_gnu_kfreebsd/gsoc2009_kfreebsd_progress_report_week_10/libparted1.8-12_1.8.8.git.2009.07.19-2_kfreebsd-i386.deb [2.6] http://slackydeb.altervista.org/files/debian_gnu_kfreebsd/gsoc2009_kfreebsd_progress_report_week_10/libparted1.8-dbg_1.8.8.git.2009.07.19-2_kfreebsd-i386.deb [2.7] http://slackydeb.altervista.org/files/debian_gnu_kfreebsd/gsoc2009_kfreebsd_progress_report_week_10/libparted1.8-dev_1.8.8.git.2009.07.19-2_kfreebsd-i386.deb [2.8] http://slackydeb.altervista.org/files/debian_gnu_kfreebsd/gsoc2009_kfreebsd_progress_report_week_10/parted_1.8.8.git.2009.07.19-2_kfreebsd-i386.deb [3.0] http://slackydeb.blogspot.com/2009/07/howto-build-busybox-package-on-debian.html [3.1] http://slackydeb.blogspot.com/2009/07/howto-build-debian-installer-monolithic.html [3.2] http://lists.debian.org/debian-boot/2009/07/msg00457.html [3.3] http://lists.debian.org/debian-boot/2009/07/msg00542.html [3.4] http://lists.debian.org/debian-boot/2009/07/msg00540.html [3.5] http://lists.debian.org/debian-boot/2009/07/msg00543.html [3.6] http://lists.debian.org/debian-boot/2009/07/msg00553.html [4.0] http://svn.debian.org/viewsvn/d-i/people/slackydeb/kfreebsd/busybox/1.13/debian/include.libbb.diff?revision=59322&view=markup [4.1] http://lists.alioth.debian.org/pipermail/soc-coordination/2009-July/000648.html [4.2] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=538171 [4.3] http://svn.debian.org/viewsvn/d-i/branches/d-i/kfreebsd/installer/build/Makefile -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Re: kFreeBSD progress report week 10
On 30/07/2009, Luca Favatella wrote: [...] > I have not been able to build iso images due to a misconfiguration on > ftp.debian.org; I will provide them when the problem is fixed. Problem is fixed now. Thanks to all people who worked on this. I built iso images for monolithic [0][1] and netboot [2][3] (I am linking both MANIFEST.udebs and mini.iso) from current kfreebsd d-i branch [4]. I included the fix at [5] too. Here you can find some of the localudebs I used (I didn't document very well how to create them) * dhcp3-client [6] * freebsd-net-tools [7] [0] http://slackydeb.altervista.org/files/debian_gnu_kfreebsd/gsoc2009_kfreebsd_progress_report_week_10/iso/monolithic/MANIFEST.udebs [1] http://slackydeb.altervista.org/files/debian_gnu_kfreebsd/gsoc2009_kfreebsd_progress_report_week_10/iso/monolithic/mini.iso [2] http://slackydeb.altervista.org/files/debian_gnu_kfreebsd/gsoc2009_kfreebsd_progress_report_week_10/iso/netboot/MANIFEST.udebs [3] http://slackydeb.altervista.org/files/debian_gnu_kfreebsd/gsoc2009_kfreebsd_progress_report_week_10/iso/netboot/mini.iso [4] http://svn.debian.org/viewsvn/d-i/branches/d-i/kfreebsd/ [5] http://svn.debian.org/viewsvn/d-i/people/slackydeb/kfreebsd/d-i/freebsd-net-tools-udeb.diff?r1=59567&r2=59893 [6] http://slackydeb.altervista.org/files/debian_gnu_kfreebsd/gsoc2009_kfreebsd_progress_report_week_10/localudebs/dhcp3-client-udeb_3.1.2p1-1_kfreebsd-i386.udeb [7] http://slackydeb.altervista.org/files/debian_gnu_kfreebsd/gsoc2009_kfreebsd_progress_report_week_10/localudebs/freebsd-net-tools-udeb_7.2-5_kfreebsd-i386.udeb -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
test of makefs in kfreebsd d-i
I tested makefs in kfreebsd d-i, and I have some problems.
I got makefs sources using
dget -u
http://www.freewrt.org/~tg/debs/dists/sid/wtf/pkgs/makefs/makefs_20090724-1.dsc
I built it using
dpkg-buildpackage -tc
I'm attaching
* a screenshot of the problem I get in the (monolithic) image built using makefs
* the patch against current kfreebsd d-i svn
http://svn.debian.org/viewsvn/d-i/branches/d-i/kfreebsd/installer/build/
How can I keep some free inodes?
How can I explicitly select ufs1 (not ufs2) in makefs? (the man page
is not so clear)
Any comment is appreciated.
Cheers,
Luca Favatella
Index: config/kfreebsd-i386.cfg
===
--- config/kfreebsd-i386.cfg (revision 59897)
+++ config/kfreebsd-i386.cfg (working copy)
@@ -9,7 +9,7 @@
KERNELIMAGEVERSION = $(KERNELVERSION)
DEBIAN_RELEASE = unstable
-INITRD_FS = ufs2
+INITRD_FS = ufs1
LSB_DISTRIB_DESCRIPTION="Debian GNU/kFreeBSD installer"
Index: Makefile
===
--- Makefile (revision 59897)
+++ Makefile (working copy)
@@ -119,16 +119,12 @@
(cd $(TREE) && find . | cpio --quiet -o -H newc) >
endef
-define mkfs.ufs2
- fs=`mktemp` ; \
- dd if=/dev/zero of=$${fs} bs=1M count=20 ; \
- md=`mdconfig -a -t vnode -f $${fs}` ; \
- mkfs.ufs -O2 /dev/$${md} ; \
- mnt=`mktemp -d` ; mount /dev/$${md} $${mnt} ; \
- cp -a $(TREE)/* $${mnt}/ ; \
- umount $${mnt} ; rmdir $${mnt} ; \
- mdconfig -d -u $${md} ; \
- mv $${fs}
+define mkfs.ufs1
+ fs=`mktemp -d` ; \
+ cp -a $(TREE)/* $${fs}/ ; \
+ tmp=`mktemp -d` ; \
+ makefs -t ffs -M 20m $${tmp}/ufs $${fs}/ ; \
+ mv $${tmp}/ufs
endef
define e2fsck
@@ -622,8 +618,8 @@
jffs2) \
$(mkjffs2) $(TEMP_INITRD); \
;; \
- ufs2) \
- $(mkfs.ufs2) $(TEMP)/initrd; \
+ ufs1) \
+ $(mkfs.ufs1) $(TEMP)/initrd; \
gzip -v9f $(TEMP)/initrd; \
;; \
*) \
<>
Re: test of makefs in kfreebsd d-i
On 04/08/2009, Thorsten Glaser wrote: > Luca Favatella dixit: > >>I'm attaching >>* a screenshot of the problem I get in the (monolithic) image built using >> makefs > > Please attach screenshots in ASCII. I mostly read my eMails either > via ssh or on an 80486DLC laptop from 1993 with not enough RAM for > XFree86®, so I cannot view any images. Sorry. Here it is (created with "qemu -boot d -cdrom mini.iso -curses"): --8< Setting up filesystem, please wait ... GEOM_LABEL: Label ufsid/4a795ec96b8b4567 removed. Starting system log daemon: syslogd. pid 58 (debconf-loadtemplat), uid 0 inumber 274 on /: out of inodes /: create/symlink failed, no inodes free /build/buildd-cdebconf_0.145-kfreebsd-i386-9tn2ab/cdebconf-0.145/src/debconf.c:1 35 (main): Cannot initialize debconf template database /build/buildd-cdebconf_0.145-kfreebsd-i386-9tn2ab/cdebconf-0.145/src/debconf.c:1 35 (main): Cannot initialize debconf template database /build/buildd-cdebconf_0.145-kfreebsd-i386-9tn2ab/cdebconf-0.145/src/debconf.c:1 35 (main): Cannot initialize debconf template database /build/buildd-cdebconf_0.145-kfreebsd-i386-9tn2ab/cdebconf-0.145/src/debconf.c:1 35 (main): Cannot initialize debconf template database /build/buildd-cdebconf_0.145-kfreebsd-i386-9tn2ab/cdebconf-0.145/src/debconf.c:1 35 (main): Cannot initialize debconf template database /build/buildd-cdebconf_0.145-kfreebsd-i386-9tn2ab/cdebconf-0.145/src/debconf.c:1 35 (main): Cannot initialize debconf template database /build/buildd-cdebconf_0.145-kfreebsd-i386-9tn2ab/cdebconf-0.145/src/debconf.c:1 35 (main): Cannot initialize debconf template database /build/buildd-cdebconf_0.145-kfreebsd-i386-9tn2ab/cdebconf-0.145/src/debconf.c:1 35 (main): Cannot initialize debconf template database /build/buildd-cdebconf_0.145-kfreebsd-i386-9tn2ab/cdebconf-0.145/src/debconf.c:1 35 (main): Cannot initialize debconf template database -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Re: test of makefs in kfreebsd d-i
On 05/08/2009, Thorsten Glaser wrote: > Luca Favatella dixit: > >>* a screenshot of the problem I get in the (monolithic) image built >> using makefs > > Ok, I see now (forwarded to workplace): [...] > cf. http://www.mirbsd.org/htman/i386/man8/makefs.htm > > I’d say your best bet is to use -f without ‘%’ – you should know beforehand > though roughly how many new inodes (symlinks, devices (probably not, due to > devfs), temp files) you’ll need; they’re allocated in groups, so a guessti- > mate is okay. I committed in the kfreebsd branch a draft patch using "-f"; see http://svn.debian.org/viewsvn/d-i?view=rev&revision=59940 It looks like there are no regressions in the produced monolithic and netboot images. > //mirabilos Thanks, Luca Favatella -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Re: test of makefs in kfreebsd d-i
On 04/08/2009, Thorsten Glaser wrote:
> Luca Favatella dixit:
[...]
> Why do you copy ${TREE}/* to a temporary $$fs/ first, anyway?
> You can run it directly on ${TREE} I'd say:
>
> define mkfs.ufs1
> sh -c 'makefs -t ffs -s ${IMGSZ} -o minfree=0,version=1 $$0 ${TREE}'
> endef
>
> Again, untested.
Tested. Please see
http://svn.debian.org/viewsvn/d-i/branches/d-i/kfreebsd/installer/build/Makefile?r1=59940&r2=59943&pathrev=59943
Thanks,
Luca Favatella
--
To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Re: test of makefs in kfreebsd d-i
On 05/08/2009, Thorsten Glaser wrote: > Luca Favatella dixit: [...] > Why didn’t you set minfree to 0 from the default of 5% as > it doesn’t make any sense in initrd? Done. http://svn.debian.org/viewsvn/d-i?view=rev&revision=59946 Can you please explain me better the difference between "-f" and "minfree" (the man page is not clear). I read: -f free-files Ensure that a minimum of free-files free files (inodes) exist in the image. An optional '%' suffix may be provided to indicate that free-files indicates a percentage of the calculated image size. minfree Minimum % free. ^ | free what? inodes (as -f)? Cheers, Luca Favatella -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Re: test of makefs in kfreebsd d-i
On 05/08/2009, Thorsten Glaser wrote: > Luca Favatella dixit: > >>Can you please explain me better the difference between "-f" and >>"minfree" (the man page is not clear). I read: > > Sure. -f ensures, for makefs(8), that the filesystem has enough > free inodes, whereas minfree is a tunefs(8) parametre you might > know from ext2fs, which measures the amount of available space > which is SUBTRACTED from the total space shown by df(1) and re- > served for the superuser. > > Clear now? Clear. > bye, > //mirabilos Thanks, Luca Favatella -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
[d-i on kfreebsd] quick status report
Hi. The kfreebsd debian-installer port did a lot of progress. Among basic features it only misses grub-installer. To let you test current status (svn r60004), I prepared * monolithic image [1] * netboot image [2] * debs needed in the build environment [3] * udebs needed in localeudebs + kernel related [4] + others [5] (each linked "ls" file is the list of files in the same directory) (In the future I'll remove these files) To test the images in QEMU $ qemu-img create vhd.img 1G $ qemu -boot d -cdrom mini.iso vhd.img Cheers, Luca Favatella [1] http://slackydeb.altervista.org/files/debian_gnu_kfreebsd/tmp/20090806/2230_r60004/monolithic/ls [2] http://slackydeb.altervista.org/files/debian_gnu_kfreebsd/tmp/20090806/2230_r60004/netboot/ls [3] http://slackydeb.altervista.org/files/debian_gnu_kfreebsd/tmp/20090806/2230_r60004/debs/ls [4] http://slackydeb.altervista.org/files/debian_gnu_kfreebsd/tmp/20090806/2230_r60004/udebs/kfreebsd-kernel-di-i386/ls [5] http://slackydeb.altervista.org/files/debian_gnu_kfreebsd/tmp/20090806/2230_r60004/udebs/ls -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
[PATCH] use grub to boot d-i CD
This patch uses grub to boot kfreebsd-i386 d-i CD.
Thanks to Robert Millan.
I tested this on kfreebsd-i386.
It should not affect GNU/Linux builds.
Please note that in the meantime I
* added "hw.ata.ata_dma=0"
* added/improved comments for "hw.ata.ata_dma=0" and "hw.ata.atapi_dma=0"
I'm not writing these things in a changelog entry.
I think it is not needed, because this first version on d-i with
kfreebsd support is unreleased yet.
Cheers,
Luca Favatella
Index: build/boot/kfreebsd/grub.cfg
===
--- build/boot/kfreebsd/grub.cfg (revision 0)
+++ build/boot/kfreebsd/grub.cfg (revision 0)
@@ -0,0 +1,18 @@
+
+set cd=$root
+
+menuentry "Install Debian GNU/kFreeBSD" {
+ echo "Loading ..."
+ set root=$cd
+ freebsd /boot/kernel/kernel.gz
+ freebsd_module_elf /boot/kernel/acpi.ko
+ freebsd_module /boot/mfsroot.gz type=mfs_root
+ set FreeBSD.vfs.root.mountfrom=ufs:/dev/md0
+ set FreeBSD.hw.ata.ata_dma=0 # needed for qemu hard disk # TODO: delete
+ set FreeBSD.hw.ata.atapi_dma=0 # needed for qemu cd # TODO: 1
+}
+
+menuentry "Boot from first hard disk" {
+ set root=hd0
+ chainloader +1
+}
Index: build/config/kfreebsd-i386.cfg
===
--- build/config/kfreebsd-i386.cfg (revision 60021)
+++ build/config/kfreebsd-i386.cfg (working copy)
@@ -12,28 +12,36 @@
INITRD_FS = ufs1
+grub_moddir=/usr/lib/grub/i386-pc
+
arch_boot_screens:
arch_tree:
-# Miniature CD image using kfreebsd-loader, with only an initrd, no udebs or debs.
+# Miniature CD image using GRUB, with only an initrd, no udebs or debs.
.PHONY: arch_miniiso
arch_miniiso: $(TEMP_INITRD) $(TEMP_KERNEL) $(TREE)
-rm -f $(TEMP_CD_TREE)/*
- mkdir -p $(TEMP_CD_TREE)/boot/{kernel,defaults}
+ mkdir -p $(TEMP_CD_TREE)/boot/{kernel,grub}
cp $(TEMP_KERNEL) $(TEMP_CD_TREE)/boot/kernel/kernel.gz
cp $(TEMP_INITRD) $(TEMP_CD_TREE)/boot/mfsroot.gz
cp $(TREE)/lib/modules/*/acpi.ko $(TEMP_CD_TREE)/boot/kernel/
- cp /boot/{cdboot,loader*,*.4th} $(TEMP_CD_TREE)/boot/
- cp /boot/defaults/loader.conf $(TEMP_CD_TREE)/boot/defaults/
- echo "hw.ata.atapi_dma=0" >> $(TEMP_CD_TREE)/boot/loader.conf # TODO: 1
- echo "mfsroot_load=\"YES\"" >> $(TEMP_CD_TREE)/boot/loader.conf
- echo "mfsroot_type=\"mfs_root\"" >> $(TEMP_CD_TREE)/boot/loader.conf
- echo "mfsroot_name=\"/boot/mfsroot\"" >> $(TEMP_CD_TREE)/boot/loader.conf
+ cp boot/kfreebsd/grub.cfg $(TEMP_CD_TREE)/boot/grub/
- genisoimage -r -J -b boot/cdboot -c boot.cat -no-emul-boot \
+ grub-mkimage -o $(TEMP_CD_TREE)/boot/grub/core.img \
+ biosdisk \
+ minicmd normal sh echo \
+ iso9660 \
+ bsd chain \
+ $(NULL)
+ cat $(grub_moddir)/cdboot.img $(TEMP_CD_TREE)/boot/grub/core.img \
+ > $(TEMP_CD_TREE)/boot/grub/grub_eltorito
+ rm $(TEMP_CD_TREE)/boot/grub/core.img
+
+ genisoimage -r -J -b boot/grub/grub_eltorito -c boot.cat -no-emul-boot \
+ -boot-load-size 4 -boot-info-table \
-o $(TEMP_MINIISO) $(TEMP_CD_TREE)
Index: debian/changelog
=======
--- debian/changelog (revision 60021)
+++ debian/changelog (working copy)
@@ -107,6 +107,7 @@
[ Luca Favatella ]
* Use arch indipendent code for LSB_DISTRIB_DESCRIPTION.
+ * Use grub to boot kfreebsd-i386 d-i CD. Thanks to Robert Millan.
-- Frans Pop Tue, 04 Aug 2009 17:40:32 +0200
Re: [d-i on kfreebsd] quick status report
On 07/08/2009, Felix Zielcke wrote: > Am Donnerstag, den 06.08.2009, 23:23 +0200 schrieb Luca Favatella: >> >> The kfreebsd debian-installer port did a lot of progress. >> Among basic features it only misses grub-installer. > > I think this small patch should be enough for grub-installer. > At least if existing support for freebsd works also under kfreebsd. Thanks. At [0] you can find kfreebsd d-i as r60026, with your patch (I fixed kfree-bsdi386 -> kfreebsd-i386). [0] http://slackydeb.altervista.org/files/debian_gnu_kfreebsd/tmp/20090807/1045_r60026/ls I tested it, and I get --8<-- ÚÄÄÄ´ [!!] Install the GRUB boot loader on a hard disk ÿ ³ Installation step failed ³ ³ An installation step failed. You can try to run the failing item ³ ³ again from the menu, or skip it and choose something else. The³ ³ failing step is: Install the GRUB boot loader on a hard disk ³ ³ ³ ³ ³ ³ ³ ÀÄÄÄÙ moves; selects; activates buttons --8<-- Aug 7 10:20:03 main-menu[102]: INFO: Menu item 'grub-installer' selected Aug 7 10:20:03 main-menu[102]: INFO: Falling back to the package description fo r os-prober-udeb Aug 7 10:20:03 main-menu[102]: INFO: Falling back to the package description fo r os-prober-udeb Aug 7 10:20:03 grub-installer: info: architecture: kfreebsd-i386/generic Aug 7 10:20:04 main-menu[102]: WARNING **: Configuring 'grub-installer' failed with error code 1 Aug 7 10:20:04 main-menu[102]: WARNING **: Menu item 'grub-installer' failed. -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Re: [PATCH] use grub to boot d-i CD
On 07/08/2009, Luca Favatella wrote: > This patch uses grub to boot kfreebsd-i386 d-i CD. Committed after ok of aurel32 on #debian-boot. Thanks, Luca Favatella -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Re: [d-i on kfreebsd] quick status report
On 06/08/2009, Luca Favatella wrote: [...] > The kfreebsd debian-installer port did a lot of progress. > Among basic features it only misses grub-installer. Now it works. Thanks to all people helping on mailing lists and IRC. Cheers, Luca Favatella -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Re: test of makefs in kfreebsd d-i
On 09/08/2009, Thorsten Glaser wrote: > Aurelien Jarno dixit: [...] >>I have just uploaded it. > > OK. Luca, good luck, have fun. > > //mirabilos, soon to be running kfreebsd in qemu again Thanks for all your help. Cheers, Luca Favatella -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
[PATCH] localechooser: ASCII only if on cons25 terminal
This patch let localechooser not to try to print non-ascii characters on a cons25 terminal. This should not affect d-i images not using cons25 terminal (e.g. linux-*). Cheers, Luca Favatella Index: debian/changelog === --- debian/changelog (revision 60241) +++ debian/changelog (working copy) @@ -3,6 +3,9 @@ * Only check for validlocale if any locales need to be generated, as otherwise we won't have installed the locales package (closes: #538343). + [ Aurelien Jarno ] + * Don't try to print non-ascii characters on a cons25 terminal. + -- Colin Watson Sat, 25 Jul 2009 11:04:09 +0100 localechooser (2.13) unstable; urgency=low Index: localechooser === --- localechooser (revision 60241) +++ localechooser (working copy) @@ -66,9 +66,9 @@ else level=1 fi - # ASCII only if we are on serial console or a dumb terminal + # ASCII only if we are on serial console, dumb or cons25 terminal # Both variables should already be set at init time - if [ "$TERM_TYPE" = "serial" ] || [ "$TERM" = "dumb" ]; then + if [ "$TERM_TYPE" = "serial" ] || [ "$TERM" = "dumb" ] || [ "$TERM" = "cons25" ] ; then level=0 fi ;;
[PATCH] d-i-utils: terminfo different from cons25 on kfreebsd-*
This patch also ships terminfo different from cons25 on GNU/kFreeBSD. This should not affect linux-* d-i images. Cheers, Luca Favatella Index: debian/changelog === --- debian/changelog (revision 60241) +++ debian/changelog (working copy) @@ -2,6 +2,10 @@ * Upgrade to debhelper v7. + [ Aurelien Jarno ] + * Also ship other terminfo on GNU/kFreeBSD, they are also used in some +cases (e.g. installation through openssh). + -- Colin Watson Thu, 13 Aug 2009 14:52:50 +0100 debian-installer-utils (1.71) unstable; urgency=low Index: debian/rules === --- debian/rules (revision 60241) +++ debian/rules (working copy) @@ -2,11 +2,11 @@ %: dh $@ -ifeq ($(DEB_HOST_ARCH_OS),linux) TERMS=/usr/share/terminfo/a/ansi /usr/share/terminfo/d/dumb \ /usr/share/terminfo/l/linux /usr/share/terminfo/v/vt102 -else ifeq ($(DEB_HOST_ARCH_OS),kfreebsd) -TERMS=/usr/share/terminfo/c/cons25 + +ifeq ($(DEB_HOST_ARCH_OS),kfreebsd) +TERMS+=/usr/share/terminfo/c/cons25 endif override_dh_auto_install:
Re: [PATCH] localechooser: ASCII only if on cons25 terminal
On 18/08/2009, Christian Perrier wrote: > Quoting Luca Favatella (slacky...@gmail.com): >> This patch let localechooser not to try to print non-ascii characters >> on a cons25 terminal. > > > I see no problem with that patch. Feel free to commit (and upload > localechooser or have Aurélien upload it). Committed. Thanks, Luca Favatella -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Re: [PATCH] d-i-utils: terminfo different from cons25 on kfreebsd-*
On 18/08/2009, Luca Favatella wrote: > This patch also ships terminfo different from cons25 on GNU/kFreeBSD. > > This should not affect linux-* d-i images. Committed after aurel32's ack on #debian-boot. (I changed openssh -> ssh) Thanks, Luca Favatella -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Re: [PATCH] grub-pc build-dependency
On 27/08/2009, Robert Millan wrote: > > Hi, Hi. > grub-pc is used during d-i build but isn't listed as build-dependency. It looks to me it is present both in trunk and branch. Please see: http://svn.debian.org/viewsvn/d-i/trunk/installer/debian/control?revision=60127 http://svn.debian.org/viewsvn/d-i/branches/d-i/kfreebsd/installer/debian/control?revision=60030 Perhaps it should go in "Boot loaders" instead of "Architecture specific build dependencies"? (I don't know) Cheers, Luca Favatella -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Re: Directions for starting with the BSD flavor of Debian
On 28/08/2009, Rogério Brito wrote: [...] >> >Are there any live CDs? Is unstable too unstable for regular use? >> Currently not, the GING is really outdated. > > I think that creating one would be a very, very good point so that we > could see further testing/adoption of kFreeBSD. I will investigate how > we could implement one. Porting Debian Live on GNU/kFreeBSD should be the clean way. http://debian-live.alioth.debian.org/ Cheers, Luca Favatella -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Re: debian-installer daily images
On 07/09/2009, Rogério Brito wrote: [...] > Now (if you people don't bark on me for reporting duplicate bugs when > I'm partly offline :)), it would be a good thing to have "official" live > CDs for the platforms, to show off what is accomplished up to this > point (and call for more help), and how usable it is (perhaps to get > more users for the port). Last week I quickly played a bit with Debian Live [0] on kfreebsd-i386, with no results. If I remember well (from #debian-kbsd and #debian-live) * unionfs should be used instead of aufs * ufs should be used instead of squashfs * live-initramfs [1] should be ported first, and then live-helper [2] * to port live-initramfs, only chroot, debootstrap and a hacked live-initramfs are needed Cheers, Luca Favatella [0] http://debian-live.alioth.debian.org/ [1] http://git.debian.net/?p=debian-live/live-initramfs.git;a=summary [2] http://git.debian.net/?p=debian-live/live-helper.git;a=summary [3] http://live.debian.net/manual/html/ch03s04.html -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
[busybox on kbsd] patches ported to 1.14
Hi, Aurelien. I ported kfreebsd busybox patches from 1.13 [0] to 1.14. It was a little task, only 3 patches needed changes to apply. I kept the patches for 1.13 in svn; I added a new dir with the ones that needed changes [1]. I updated the wiki page [2]. I only tested building busybox. I didn't test the resulting binaries. Should the udeb from busybox 1.14 be used in daily builds of d-i instead of that from 1.13? Can I help in doing this? How? Cheers, Luca Favatella [0] http://svn.debian.org/viewsvn/d-i/people/slackydeb/kfreebsd/busybox/1.13/debian/ [1] http://svn.debian.org/viewsvn/d-i/people/slackydeb/kfreebsd/busybox/1.14/debian/ [2] http://wiki.debian.org/DebianInstaller/kFreeBSD#BusyBox -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Re: [busybox on kbsd] patches ported to 1.14
Hi Otavio, hi Bastian. On Tue, Sep 29, 2009 at 11:35:07PM -0300, Otavio Salvador wrote: [...] > On Tue, Sep 29, 2009 at 11:29 PM, Bastian Blank wrote: > > On Tue, Sep 29, 2009 at 10:07:02PM -0300, Otavio Salvador wrote: > >> I'd suggest getting it commited in the package and uploaded to sid; > >> Bastian, do you object? > > > > Well, there is a 1.15.1 already as stable. 1.15.x has already a couple of these patches in. It would be great to have 1.15.x packaged in Debian (experimental?). > Anyway; do you object to Luca commit the specific patches and get them > applied only for kfreebsd-*? Some of them are a bit hackish, however they should not affect Linux (except for config). Cheers, Luca Favatella -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Re: [busybox on kbsd] patches ported to 1.14
On 01/10/2009, Aurelien Jarno wrote: > Luca Favatella a écrit : [...] >> I ported kfreebsd busybox patches from 1.13 [0] to 1.14. It was a little >> task, only 3 patches needed changes to apply. >> I kept the patches for 1.13 in svn; I added a new dir with the ones that >> needed changes [1]. >> >> I updated the wiki page [2]. >> >> I only tested building busybox. I didn't test the resulting binaries. > > Thanks, I'll test that. Ok, thanks. >> Should the udeb from busybox 1.14 be used in daily builds of d-i instead >> of that from 1.13? >> Can I help in doing this? How? >> > > I'll test a build of d-i with this new version, and if it works, I'll > put the udeb on the machines generating the daily builds. Thanks, Luca Favatella -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Re: [busybox on kbsd] patches ported to 1.14
On 05/10/2009, Aurelien Jarno wrote: [...] > I have tested d-i with busybox 1.14.2 and your patches and it works > well. Thanks! It will be used in the daily builds starting today. Thanks. When I have a bit of free time I hope to * clean a bit the svn dir to keep only 1.14 patches (moving patches and deleting the 1.13 dir) * accordingly update the wiki page Cheers, Luca Favatella -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Re: [busybox on kbsd] patches ported to 1.14
On 05/10/2009, Luca Favatella wrote: > On 05/10/2009, Aurelien Jarno wrote: > [...] >> I have tested d-i with busybox 1.14.2 and your patches and it works >> well. Thanks! It will be used in the daily builds starting today. > > Thanks. > > When I have a bit of free time I hope to > * clean a bit the svn dir to keep only 1.14 patches (moving patches > and deleting the 1.13 dir) > * accordingly update the wiki page Done. (The patches are the same, I only moved them) Cheers, Luca Favatella -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Re: Problem with the port of Debian/kfreeBSD Installer
On 29/10/2009, antonandr...@fmi.uni-sofia.bg wrote: > Hello, Hi. > I have experienced a problem with the debian installer for Debian/kfreeBSD [...] > It all worked well until it reached "apt-get config" -> "Select and Install > software" and then freezed at 1% for a long time and it does nothing. I do > not think it will ever reach 2%. The system is still responsive, but seems > like nothing is happening - nor disk or network activity. I started trying to reproduce this on qemu. > The system is a Virtual Box image, but a previous image of the mini.iso have "previous image"... Do you please remember the date? Before 5 October 2009 [0]? > worked fine before and I haven't changed anything to the virtual machine, > neither I have upgrade it. Cheers, Luca Favatella [0] http://lists.debian.org/debian-boot/2009/10/msg00028.html -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Re: Problem with the port of Debian/kfreeBSD Installer
On 29/10/2009, Luca Favatella wrote: > On 29/10/2009, antonandr...@fmi.uni-sofia.bg > wrote: [...] >> I have experienced a problem with the debian installer for >> Debian/kfreeBSD > [...] >> It all worked well until it reached "apt-get config" -> "Select and >> Install >> software" and then freezed at 1% for a long time and it does nothing. I >> do >> not think it will ever reach 2%. The system is still responsive, but >> seems >> like nothing is happening - nor disk or network activity. > > I started trying to reproduce this on qemu. Both versions of qemu in lenny and squeeze have problems. I switched to VirtualBox too. I get the same problem. Perhaps it is in pkgsel? Last part of log (alt-f4) is following. --8< Oct 29 18:55:20 main-menu[106]: INFO: Falling back to the package description for auto-install Oct 29 18:55:20 main-menu[106]: INFO: Menu item 'pkgsel' selected Oct 29 18:55:24 in-target: Reading package lists... Oct 29 18:55:31 in-target: Oct 29 18:55:31 in-target: Building dependency tree... Oct 29 18:55:31 in-target: Reading state information... Oct 29 18:55:31 in-target: Initializing package states... Oct 29 18:55:31 in-target: Oct 29 18:55:31 in-target: Writing extended state information... Oct 29 18:55:32 in-target: Oct 29 18:55:32 in-target: Reading task descriptions... Oct 29 18:55:32 in-target: -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Re: Problem with the port of Debian/kfreeBSD Installer
On 29/10/2009, antonandr...@fmi.uni-sofia.bg wrote: > Hi, Luca > > I have posted before in this mailing list the exact image that worked for > me: 12.09.2009 Sorry, I missed it. Thanks for the reminder. > Seems like VirtualBox is not causing the problem this time. -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Re: Purpose driving kfreebsd?
On 08/12/2009, Brian Gupta wrote: [...] > I was looking for FAQs and such, do > you have any? [...] > Basically I get the sense that most folks are like me, in that they > know it exists, they just don't really know anyone who uses it, nor do > they understand why someone would use it. (Over plain Debian or > FreeBSD). Perhaps you are interested in this page http://wiki.debian.org/Debian_GNU/kFreeBSD_why Cheers, Luca Favatella -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
