Bug#820151: kfreebsd-10: non-DFSG mode (for ubuntuBSD)
Control: tags -1 + pending Jon Boden wrote: > On Sat, Apr 09, 2016 at 01:15:33AM +0100, Steven Chamberlain wrote: > > My first thought is to use the Version field; that already determines > > what SVN revision is checked out from which branch. If it contained > > something like "+nonfree", get-orig-source could retain the non-free > > stuff, and build targets could alter their behaviour. The non-free > > source package would be easily identifiable as such, and as being > > different from Debian's own. > > Works for me. Would you like a patch to do that? I've committed my take on this as SVN r5987 of svn://anonscm.debian.org/glibc-bsd/trunk/kfreebsd-10 This is our experimental 10.3 branch, however. I'm still testing it. It will likely go into sid in the next couple of weeks. > > I'm considering to also add +nonfree to the abiname when building > > non-free source. Side effects are that this appears in `uname -a` > > output and the names of binary packages; it makes them > > co-installable with the original DFSG kernels, and GRUB2 would give them > > separate menu entries. > > If it's going to be so exposed, could we use something that doesn't > have as much negative connotation? That was my plan all along ;) Then maybe users will ask "where can I get the free one"? Actually by each having a different abiname, should make them co-installable on a machine; you could someday have separate suites offering free and non-free versions. (And maybe Debian could too, for that matter). The binary packages are also named with the "+nonfree" or "+sourceless" tag, allowing popcon to track them separately from DFSG-free packages, to gauge their relative popularity. > Internally the build system uses "sourceless". How does that sound? I'm fine with whatever name you want to use. It only required an extra half-life of code to make that possible. Upstream does call this "sourceless". Within Debian - we would obviously call it non-free, and to me that seems the most accurate term - but what you call it in your distribution is entirely your choice. Regards, -- Steven Chamberlain ste...@pyro.eu.org signature.asc Description: Digital signature
Bug#820151: kfreebsd-10: non-DFSG mode (for ubuntuBSD)
On Sat, 9 Apr 2016 12:48:28 +0200 Jon Boden wrote: > > Hi Steven > > On Sat, Apr 09, 2016 at 01:15:33AM +0100, Steven Chamberlain wrote: > > My first thought is to use the Version field; that already > > determines what SVN revision is checked out from which branch. If > > it contained something like "+nonfree", get-orig-source could > > retain the non-free stuff, and build targets could alter their > > behaviour. The non-free source package would be easily > > identifiable as such, and as being different from Debian's own. > > > > Can anyone tell me if that's a bad idea for any reason? > > > > It's intended the "+nonfree" would be in the upstream part of the > > version number, so that the .orig.tar.xz gets a new name, e.g. > > 10.3~svn296998-2 -> 10.3~svn296998+nonfree-2 > > though I'd happily grep the entire version string for it, and still > > try to do the right thing in case someone mistakenly did: > > 10.3~svn296998-2+nonfree > > Works for me. Would you like a patch to do that? > > > I'm considering to also add +nonfree to the abiname when building > > non-free source. Side effects are that this appears in `uname -a` > > output and the names of binary packages; it makes them > > co-installable with the original DFSG kernels, and GRUB2 would give > > them separate menu entries. > > If it's going to be so exposed, could we use something that doesn't > have as much negative connotation? Internally the build system uses > "sourceless". How does that sound? The term non-free is quite accurate in this case. It's not as if the target audience of Ubuntu are free software purists anyway- no one will notice or care. Why hide the fact? pgpmJ37WgdQPT.pgp Description: OpenPGP digital signature
Bug#820151: kfreebsd-10: non-DFSG mode (for ubuntuBSD)
Hi Steven On Sat, Apr 09, 2016 at 01:15:33AM +0100, Steven Chamberlain wrote: > My first thought is to use the Version field; that already determines > what SVN revision is checked out from which branch. If it contained > something like "+nonfree", get-orig-source could retain the non-free > stuff, and build targets could alter their behaviour. The non-free > source package would be easily identifiable as such, and as being > different from Debian's own. > > Can anyone tell me if that's a bad idea for any reason? > > It's intended the "+nonfree" would be in the upstream part of the > version number, so that the .orig.tar.xz gets a new name, e.g. > 10.3~svn296998-2 -> 10.3~svn296998+nonfree-2 > though I'd happily grep the entire version string for it, and still try > to do the right thing in case someone mistakenly did: > 10.3~svn296998-2+nonfree Works for me. Would you like a patch to do that? > I'm considering to also add +nonfree to the abiname when building > non-free source. Side effects are that this appears in `uname -a` > output and the names of binary packages; it makes them > co-installable with the original DFSG kernels, and GRUB2 would give them > separate menu entries. If it's going to be so exposed, could we use something that doesn't have as much negative connotation? Internally the build system uses "sourceless". How does that sound? Either way I can live with it :-) > Having different package versions in Debian / *buntu is quite normal and > I think it would fit into Jon's workflow. Yes, perfectly so. Thank you -- Jon Boden ubuntuBSD -- The power of FreeBSD kernel with familiarity of Ubuntu OS! http://www.ubuntubsd.org/ -- https://twitter.com/ubuntuBSD
Bug#820151: kfreebsd-10: non-DFSG mode (for ubuntuBSD)
On Sat, Apr 09, 2016 at 01:09:03AM +0200, Guillem Jover wrote: > > + lsb-release, > > You don't need this, see below… > > > Standards-Version: 3.9.2 > > > > Package: kfreebsd-source-@version@ > > Index: debian/rules > > === > > --- debian/rules(revision 5986) > > +++ debian/rules(working copy) > > @@ -23,7 +23,13 @@ > > configfile := DEBCUSTOM > > abiname:= 0 > > ld_target := $(shell ld --help | sed -ne "s/[^ :]*: supported targets: > > \([^ ]*\) .*/\1/p") > > +distributor:= $(shell lsb_release -is || echo Debian) > > …you can use dpkg-vendor instead, which does not need any additional > build dependency. Noted, thanks! -- Jon Boden ubuntuBSD -- The power of FreeBSD kernel with familiarity of Ubuntu OS! http://www.ubuntubsd.org/ -- https://twitter.com/ubuntuBSD
Bug#820151: kfreebsd-10: non-DFSG mode (for ubuntuBSD)
Hi, Guillem Jover wrote: > On Tue, 2016-04-05 at 23:17:08 +0200, Jon Boden wrote: > > This patch has no effect on Debian but it enables "non-DFSG mode" when > > compiling kfreebsd-10 on ubuntuBSD. Please could you apply it to make > > it easier for us to resync with kfreebsd-10? > > Is this acceptable for the Ubuntu archive? In any case that's > something for the current kFreeBSD manintainers to agree with. I didn't like the vendor detection part of Jon's patch anyway. I still would like to offer a solution though. If simply moving from Debian to *buntu, adds non-free things to the source package or affects the build, I'd like that to be more obvious. And although Jon provided a way to override this in debian/rules, it is still necessary to get-orig-source again for a change to take effect. That makes me think it is not really a build-time setting but more of a get-orig-source setting, which is persistent after that. My first thought is to use the Version field; that already determines what SVN revision is checked out from which branch. If it contained something like "+nonfree", get-orig-source could retain the non-free stuff, and build targets could alter their behaviour. The non-free source package would be easily identifiable as such, and as being different from Debian's own. Can anyone tell me if that's a bad idea for any reason? It's intended the "+nonfree" would be in the upstream part of the version number, so that the .orig.tar.xz gets a new name, e.g. 10.3~svn296998-2 -> 10.3~svn296998+nonfree-2 though I'd happily grep the entire version string for it, and still try to do the right thing in case someone mistakenly did: 10.3~svn296998-2+nonfree I'm considering to also add +nonfree to the abiname when building non-free source. Side effects are that this appears in `uname -a` output and the names of binary packages; it makes them co-installable with the original DFSG kernels, and GRUB2 would give them separate menu entries. Having different package versions in Debian / *buntu is quite normal and I think it would fit into Jon's workflow. He needs to get-orig-source anyway, adding a "+nonfree" version suffix is easy to do, and nothing else should need patching to get the result he wants. And, this is useful to Debian users, as an easier way to locally make a non-free kfreebsd-10 package, for those who want to do that. Regards, -- Steven Chamberlain ste...@pyro.eu.org signature.asc Description: Digital signature
Bug#820151: kfreebsd-10: non-DFSG mode (for ubuntuBSD)
Hi! On Tue, 2016-04-05 at 23:17:08 +0200, Jon Boden wrote: > Package: kfreebsd-10 > Version: 10.1~svn274115-4+kbsd8u3 > Severity: wishlist > Tags: patch > This patch has no effect on Debian but it enables "non-DFSG mode" when > compiling kfreebsd-10 on ubuntuBSD. Please could you apply it to make > it easier for us to resync with kfreebsd-10? Is this acceptable for the Ubuntu archive? In any case that's something for the current kFreeBSD manintainers to agree with. > Index: debian/control.in > === > --- debian/control.in (revision 5986) > +++ debian/control.in (working copy) > @@ -23,6 +23,7 @@ > pkg-config, > libsbuf-dev (>= 9.0+ds1-2), > kernel-wedge (>= 2.79) [kfreebsd-any], > + lsb-release, You don't need this, see below… > Standards-Version: 3.9.2 > > Package: kfreebsd-source-@version@ > Index: debian/rules > === > --- debian/rules (revision 5986) > +++ debian/rules (working copy) > @@ -23,7 +23,13 @@ > configfile := DEBCUSTOM > abiname := 0 > ld_target:= $(shell ld --help | sed -ne "s/[^ :]*: supported targets: > \([^ ]*\) .*/\1/p") > +distributor := $(shell lsb_release -is || echo Debian) …you can use dpkg-vendor instead, which does not need any additional build dependency. Thanks, Guillem
Bug#820151: kfreebsd-10: non-DFSG mode (for ubuntuBSD)
Package: kfreebsd-10 Version: 10.1~svn274115-4+kbsd8u3 Severity: wishlist Tags: patch Hi This patch has no effect on Debian but it enables "non-DFSG mode" when compiling kfreebsd-10 on ubuntuBSD. Please could you apply it to make it easier for us to resync with kfreebsd-10? It also makes it easier for Debian users if they want to build a custom package with sourceless bits (by just changing one line in debian/rules). Thanks a lot -- Jon Boden ubuntuBSD -- The power of FreeBSD kernel with familiarity of Ubuntu OS! http://www.ubuntubsd.org/ -- https://twitter.com/ubuntuBSD Index: debian/control.in === --- debian/control.in (revision 5986) +++ debian/control.in (working copy) @@ -23,6 +23,7 @@ pkg-config, libsbuf-dev (>= 9.0+ds1-2), kernel-wedge (>= 2.79) [kfreebsd-any], + lsb-release, Standards-Version: 3.9.2 Package: kfreebsd-source-@version@ Index: debian/local/ar9300_devid.h === --- debian/local/ar9300_devid.h (revision 0) +++ debian/local/ar9300_devid.h (working copy) @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2008-2011 Atheros Communications Inc. + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#ifndef __AR9300_DEVID_H__ +#define __AR9300_DEVID_H__ + +/* Atheros chipsets */ +#define AR_SREV_VERSION_AR5416_PCI 0xD +#define AR_SREV_VERSION_AR5416_PCIE 0xC +#define AR_SREV_REVISION_AR5416_10 0 +#define AR_SREV_REVISION_AR5416_20 1 +#define AR_SREV_REVISION_AR5416_22 2 +#define AR_SREV_VERSION_AR9100 0x14 +#define AR_SREV_VERSION_AR9160 0x40 +#define AR_SREV_REVISION_AR9160_10 0 +#define AR_SREV_REVISION_AR9160_11 1 +#define AR_SREV_VERSION_AR9280 0x80 +#define AR_SREV_REVISION_AR9280_10 0 +#define AR_SREV_REVISION_AR9280_20 1 +#define AR_SREV_REVISION_AR9280_21 2 +#define AR_SREV_VERSION_AR9285 0xC0 +#define AR_SREV_REVISION_AR9285_10 0 +#define AR_SREV_REVISION_AR9285_11 1 +#define AR_SREV_REVISION_AR9285_12 2 +#define AR_SREV_VERSION_AR9287 0x180 +#define AR_SREV_REVISION_AR9287_10 0 +#define AR_SREV_REVISION_AR9287_11 1 +#define AR_SREV_REVISION_AR9287_12 2 +#define AR_SREV_REVISION_AR9287_13 3 +#define AR_SREV_VERSION_AR9271 0x140 +#define AR_SREV_REVISION_AR9271_10 0 +#define AR_SREV_REVISION_AR9271_11 1 +#define AR_SREV_VERSION_AR9300 0x1c0 +#define AR_SREV_REVISION_AR9300_20 2 /* 2.0 and 2.1 */ +#define AR_SREV_REVISION_AR9300_22 3 +#define AR_SREV_VERSION_AR9330 0x200 +#define AR_SREV_REVISION_AR9330_10 0 +#define AR_SREV_REVISION_AR9330_11 1 +#define AR_SREV_REVISION_AR9330_12 2 +#define AR_SREV_VERSION_AR9485 0x240 +#define AR_SREV_REVISION_AR9485_10 0 +#define AR_SREV_REVISION_AR9485_11 1 +#define AR_SREV_VERSION_AR9340 0x300 +#define AR_SREV_REVISION_AR9340_10 0 +#define AR_SREV_REVISION_AR9340_11 1 +#define AR_SREV_REVISION_AR9340_12 2 +#define AR_SREV_REVISION_AR9340_13 3 +#define AR_SREV_VERSION_AR9380 0x1C0 +#define AR_SREV_VERSION_AR9580 0x1C0 +#define AR_SREV_REVISION_AR9580_10 4 /* AR9580 1.0 */ +#define AR_SREV_VERSION_AR9460 0x280 +#define AR_SREV_VERSION_AR9462 0x280 +#define AR_SREV_REVISION_AR9462_20 2 +#define AR_SREV_REVISION_AR9462_21 3 + +/* Qualcomm Atheros chipsets */ +#define AR_SREV_VERSION_QCA9565 0x2C0 +#define AR_SREV_REVISION_QCA9565_10 0 +#define AR_SREV_REVISION_QCA9565_101 1 +#define AR_SREV_REVISION_QCA9565_11 2 +#define AR_SREV_VERSION_QCA9550 0x400 +#define AR_SREV_VERSION_QCA9531 0x500 +#define AR_SREV_REVISION_QCA9531_10 0 +#define AR_SREV_REVISION_QCA9531_11 1 + +#endif Index: debian/patches/999_config.diff === --- debian/patches/999_config.diff (revision 5986) +++ debian/patches/999_config.diff (working copy) @@ -48,7 +48,7 @@ options SYSVSHM # SYSV-style shared memory --- /dev/null +++ b/sys/conf/DEBIAN -@@ -0,0 +1,52 @@ +@@ -0,0 +1,49 @@ +# Common options to all Debian GNU/kFreeBSD kernels + +options LINPROCFS @@ -87,9 +87,6 @@ +options ALTQ_HFSC # Hierarchical Packet Scheduler (HFSC) +options ALTQ_PRIQ # Priority Queuing (PRIQ) + -+# Disable binary blobs -+include WITHOUT_SOURCELESS -+ +# In order to enable IPSEC you MUST also add device crypto to +# your kernel configuration +device crypto # core crypto suppo
