[Glibc-bsd-commits] r2750 - in trunk/kfreebsd-8/debian: . arch/amd64 arch/i386 patches
Petr Salinger
ps-guest at alioth.debian.org
Sun Aug 30 07:45:00 UTC 2009
Author: ps-guest
Date: 2009-08-30 07:45:00 +0000 (Sun, 30 Aug 2009)
New Revision: 2750
Added:
trunk/kfreebsd-8/debian/kfreebsd-image.README.Debian
trunk/kfreebsd-8/debian/kfreebsd-image.postrm.in
trunk/kfreebsd-8/debian/kfreebsd-image.preinst.in
trunk/kfreebsd-8/debian/kfreebsd-image.prerm.in
trunk/kfreebsd-8/debian/patches/914_psm.diff
Modified:
trunk/kfreebsd-8/debian/arch/amd64/amd64.config
trunk/kfreebsd-8/debian/arch/i386/486.config
trunk/kfreebsd-8/debian/arch/i386/686-smp.config
trunk/kfreebsd-8/debian/arch/i386/686.config
trunk/kfreebsd-8/debian/changelog
trunk/kfreebsd-8/debian/control.in
trunk/kfreebsd-8/debian/copyright
trunk/kfreebsd-8/debian/kfreebsd-image.overrides
trunk/kfreebsd-8/debian/kfreebsd-image.postinst.in
trunk/kfreebsd-8/debian/patches/903_disable_non-free_drivers.diff
trunk/kfreebsd-8/debian/rules
Log:
merge from kfreebsd-7
Modified: trunk/kfreebsd-8/debian/arch/amd64/amd64.config
===================================================================
--- trunk/kfreebsd-8/debian/arch/amd64/amd64.config 2009-08-30 07:42:52 UTC (rev 2749)
+++ trunk/kfreebsd-8/debian/arch/amd64/amd64.config 2009-08-30 07:45:00 UTC (rev 2750)
@@ -10,5 +10,6 @@
options LINPROCFS
options LINSYSFS
options FDESCFS
+options TMPFS
#include GENERIC
Modified: trunk/kfreebsd-8/debian/arch/i386/486.config
===================================================================
--- trunk/kfreebsd-8/debian/arch/i386/486.config 2009-08-30 07:42:52 UTC (rev 2749)
+++ trunk/kfreebsd-8/debian/arch/i386/486.config 2009-08-30 07:45:00 UTC (rev 2750)
@@ -10,6 +10,7 @@
options LINPROCFS
options LINSYSFS
options FDESCFS
+options TMPFS
# Xbox support
options XBOX
Modified: trunk/kfreebsd-8/debian/arch/i386/686-smp.config
===================================================================
--- trunk/kfreebsd-8/debian/arch/i386/686-smp.config 2009-08-30 07:42:52 UTC (rev 2749)
+++ trunk/kfreebsd-8/debian/arch/i386/686-smp.config 2009-08-30 07:45:00 UTC (rev 2750)
@@ -11,5 +11,6 @@
options LINPROCFS
options LINSYSFS
options FDESCFS
+options TMPFS
#include GENERIC
Modified: trunk/kfreebsd-8/debian/arch/i386/686.config
===================================================================
--- trunk/kfreebsd-8/debian/arch/i386/686.config 2009-08-30 07:42:52 UTC (rev 2749)
+++ trunk/kfreebsd-8/debian/arch/i386/686.config 2009-08-30 07:45:00 UTC (rev 2750)
@@ -8,6 +8,7 @@
options LINPROCFS
options LINSYSFS
options FDESCFS
+options TMPFS
# Xbox support
options XBOX
Modified: trunk/kfreebsd-8/debian/changelog
===================================================================
--- trunk/kfreebsd-8/debian/changelog 2009-08-30 07:42:52 UTC (rev 2749)
+++ trunk/kfreebsd-8/debian/changelog 2009-08-30 07:45:00 UTC (rev 2750)
@@ -3,7 +3,6 @@
[ Petr Salinger ]
* New upstream snapshot of RELENG_8
- 011_brandinfo.diff dropped, fixed upstream
- * Enhance 007_clone_signals.diff
* Alter Build-depends as freebsd-buildutils 7.0 is still sufficent
* Update of some patches
* Disable SSP, under QEMU it currently leads to panic :-(
@@ -19,6 +18,29 @@
-- Aurelien Jarno <aurel32 at debian.org> Sat, 29 Aug 2009 15:18:23 +0200
+kfreebsd-7 (7.2-6) UNRELEASED; urgency=low
+
+ [ Aurelien Jarno ]
+ * Really build the ZFS module.
+ * Enable TMPFS, it is need early in the boot process.
+
+ [ Petr Salinger ]
+ * Enhance 007_clone_signals.diff
+
+ -- Aurelien Jarno <aurel32 at debian.org> Sat, 22 Aug 2009 13:30:16 +0200
+
+kfreebsd-7 (7.2-5) unstable; urgency=low
+
+ * Build the ZFS module, and at a README.Debian explaining it may not
+ be legaly possible to load both ext2fs.ko and zfs.ko at the same time.
+ * Add basic support for /etc/kernel-img.conf (do_symlinks, preinst_hook,
+ prerm_hook, postinst_hook, postrm_hook), to be able to call update-grub
+ after a kernel installation.
+ * 914_psm.diff: fix PS/2 mouse support in Xorg.
+ * debian/control.in: bump Standards-Version to 3.8.3 (no changes).
+
+ -- Aurelien Jarno <aurel32 at debian.org> Fri, 21 Aug 2009 00:25:50 +0200
+
kfreebsd-7 (7.2-4) unstable; urgency=low
* Move some changes from 999_config.diff into the configuration files.
@@ -65,7 +87,7 @@
* Move ndiswrapper modules to kfreebsd-image, the same way the Linux
modules are in main in the Debian.
- -- Aurelien Jarno <aurel32 at debian.org> Fri, 12 Jun 2009 09:44:19 +0200
+ -- Aurelien Jarno <aurel32 at debian.org> Sun, 31 May 2009 21:35:04 +0200
kfreebsd-7 (7.1-4) unstable; urgency=low
Modified: trunk/kfreebsd-8/debian/control.in
===================================================================
--- trunk/kfreebsd-8/debian/control.in 2009-08-30 07:42:52 UTC (rev 2749)
+++ trunk/kfreebsd-8/debian/control.in 2009-08-30 07:45:00 UTC (rev 2750)
@@ -6,7 +6,7 @@
Vcs-Browser: http://svn.debian.org/wsvn/glibc-bsd/trunk/kfreebsd-@major@/
Vcs-Svn: svn://svn.debian.org/glibc-bsd/trunk/kfreebsd-@major@/
Build-Depends: debhelper (>= 5.0.0), bzip2, quilt, freebsd-buildutils (>= 7) [kfreebsd-i386 kfreebsd-amd64], libdb-dev, flex-old | flex, libbsd-dev [kfreebsd-i386 kfreebsd-amd64], gcc-4.3 [kfreebsd-i386 kfreebsd-amd64], sharutils
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
Package: kfreebsd-source- at version@
Architecture: all
Modified: trunk/kfreebsd-8/debian/copyright
===================================================================
--- trunk/kfreebsd-8/debian/copyright 2009-08-30 07:42:52 UTC (rev 2749)
+++ trunk/kfreebsd-8/debian/copyright 2009-08-30 07:45:00 UTC (rev 2750)
@@ -33,9 +33,391 @@
under other licenses:
Sources in `src/gnu' directory are licensed under the GNU General Public
- License. On Debian GNU systems, the complete text of the GNU General Public
- License can be found in `/usr/share/common-licenses/GPL'.
+ License version 2. On Debian GNU systems, the complete text of the GNU
+ General Public License version 2 can be found in
+ `/usr/share/common-licenses/GPL-2'.
+ Sources in `src/cddl' directory are licensed under the Common Development
+ and Distribution License, as shown below:
+
+ COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0
+
+ 1. Definitions.
+
+ 1.1. "Contributor" means each individual or entity that creates
+ or contributes to the creation of Modifications.
+
+ 1.2. "Contributor Version" means the combination of the Original
+ Software, prior Modifications used by a Contributor (if any),
+ and the Modifications made by that particular Contributor.
+
+ 1.3. "Covered Software" means (a) the Original Software, or (b)
+ Modifications, or (c) the combination of files containing
+ Original Software with files containing Modifications, in
+ each case including portions thereof.
+
+ 1.4. "Executable" means the Covered Software in any form other
+ than Source Code.
+
+ 1.5. "Initial Developer" means the individual or entity that first
+ makes Original Software available under this License.
+
+ 1.6. "Larger Work" means a work which combines Covered Software or
+ portions thereof with code not governed by the terms of this
+ License.
+
+ 1.7. "License" means this document.
+
+ 1.8. "Licensable" means having the right to grant, to the maximum
+ extent possible, whether at the time of the initial grant or
+ subsequently acquired, any and all of the rights conveyed
+ herein.
+
+ 1.9. "Modifications" means the Source Code and Executable form of
+ any of the following:
+
+ A. Any file that results from an addition to, deletion from or
+ modification of the contents of a file containing Original
+ Software or previous Modifications;
+
+ B. Any new file that contains any part of the Original
+ Software or previous Modifications; or
+
+ C. Any new file that is contributed or otherwise made
+ available under the terms of this License.
+
+ 1.10. "Original Software" means the Source Code and Executable
+ form of computer software code that is originally released
+ under this License.
+
+ 1.11. "Patent Claims" means any patent claim(s), now owned or
+ hereafter acquired, including without limitation, method,
+ process, and apparatus claims, in any patent Licensable by
+ grantor.
+
+ 1.12. "Source Code" means (a) the common form of computer software
+ code in which modifications are made and (b) associated
+ documentation included in or with such code.
+
+ 1.13. "You" (or "Your") means an individual or a legal entity
+ exercising rights under, and complying with all of the terms
+ of, this License. For legal entities, "You" includes any
+ entity which controls, is controlled by, or is under common
+ control with You. For purposes of this definition,
+ "control" means (a) the power, direct or indirect, to cause
+ the direction or management of such entity, whether by
+ contract or otherwise, or (b) ownership of more than fifty
+ percent (50%) of the outstanding shares or beneficial
+ ownership of such entity.
+
+ 2. License Grants.
+
+ 2.1. The Initial Developer Grant.
+
+ Conditioned upon Your compliance with Section 3.1 below and
+ subject to third party intellectual property claims, the Initial
+ Developer hereby grants You a world-wide, royalty-free,
+ non-exclusive license:
+
+ (a) under intellectual property rights (other than patent or
+ trademark) Licensable by Initial Developer, to use,
+ reproduce, modify, display, perform, sublicense and
+ distribute the Original Software (or portions thereof),
+ with or without Modifications, and/or as part of a Larger
+ Work; and
+
+ (b) under Patent Claims infringed by the making, using or
+ selling of Original Software, to make, have made, use,
+ practice, sell, and offer for sale, and/or otherwise
+ dispose of the Original Software (or portions thereof).
+
+ (c) The licenses granted in Sections 2.1(a) and (b) are
+ effective on the date Initial Developer first distributes
+ or otherwise makes the Original Software available to a
+ third party under the terms of this License.
+
+ (d) Notwithstanding Section 2.1(b) above, no patent license is
+ granted: (1) for code that You delete from the Original
+ Software, or (2) for infringements caused by: (i) the
+ modification of the Original Software, or (ii) the
+ combination of the Original Software with other software
+ or devices.
+
+ 2.2. Contributor Grant.
+
+ Conditioned upon Your compliance with Section 3.1 below and
+ subject to third party intellectual property claims, each
+ Contributor hereby grants You a world-wide, royalty-free,
+ non-exclusive license:
+
+ (a) under intellectual property rights (other than patent or
+ trademark) Licensable by Contributor to use, reproduce,
+ modify, display, perform, sublicense and distribute the
+ Modifications created by such Contributor (or portions
+ thereof), either on an unmodified basis, with other
+ Modifications, as Covered Software and/or as part of a
+ Larger Work; and
+
+ (b) under Patent Claims infringed by the making, using, or
+ selling of Modifications made by that Contributor either
+ alone and/or in combination with its Contributor Version
+ (or portions of such combination), to make, use, sell,
+ offer for sale, have made, and/or otherwise dispose of:
+ (1) Modifications made by that Contributor (or portions
+ thereof); and (2) the combination of Modifications made by
+ that Contributor with its Contributor Version (or portions
+ of such combination).
+
+ (c) The licenses granted in Sections 2.2(a) and 2.2(b) are
+ effective on the date Contributor first distributes or
+ otherwise makes the Modifications available to a third
+ party.
+
+ (d) Notwithstanding Section 2.2(b) above, no patent license is
+ granted: (1) for any code that Contributor has deleted
+ from the Contributor Version; (2) for infringements caused
+ by: (i) third party modifications of Contributor Version,
+ or (ii) the combination of Modifications made by that
+ Contributor with other software (except as part of the
+ Contributor Version) or other devices; or (3) under Patent
+ Claims infringed by Covered Software in the absence of
+ Modifications made by that Contributor.
+
+ 3. Distribution Obligations.
+
+ 3.1. Availability of Source Code.
+
+ Any Covered Software that You distribute or otherwise make
+ available in Executable form must also be made available in Source
+ Code form and that Source Code form must be distributed only under
+ the terms of this License. You must include a copy of this
+ License with every copy of the Source Code form of the Covered
+ Software You distribute or otherwise make available. You must
+ inform recipients of any such Covered Software in Executable form
+ as to how they can obtain such Covered Software in Source Code
+ form in a reasonable manner on or through a medium customarily
+ used for software exchange.
+
+ 3.2. Modifications.
+
+ The Modifications that You create or to which You contribute are
+ governed by the terms of this License. You represent that You
+ believe Your Modifications are Your original creation(s) and/or
+ You have sufficient rights to grant the rights conveyed by this
+ License.
+
+ 3.3. Required Notices.
+
+ You must include a notice in each of Your Modifications that
+ identifies You as the Contributor of the Modification. You may
+ not remove or alter any copyright, patent or trademark notices
+ contained within the Covered Software, or any notices of licensing
+ or any descriptive text giving attribution to any Contributor or
+ the Initial Developer.
+
+ 3.4. Application of Additional Terms.
+
+ You may not offer or impose any terms on any Covered Software in
+ Source Code form that alters or restricts the applicable version
+ of this License or the recipients' rights hereunder. You may
+ choose to offer, and to charge a fee for, warranty, support,
+ indemnity or liability obligations to one or more recipients of
+ Covered Software. However, you may do so only on Your own behalf,
+ and not on behalf of the Initial Developer or any Contributor.
+ You must make it absolutely clear that any such warranty, support,
+ indemnity or liability obligation is offered by You alone, and You
+ hereby agree to indemnify the Initial Developer and every
+ Contributor for any liability incurred by the Initial Developer or
+ such Contributor as a result of warranty, support, indemnity or
+ liability terms You offer.
+
+ 3.5. Distribution of Executable Versions.
+
+ You may distribute the Executable form of the Covered Software
+ under the terms of this License or under the terms of a license of
+ Your choice, which may contain terms different from this License,
+ provided that You are in compliance with the terms of this License
+ and that the license for the Executable form does not attempt to
+ limit or alter the recipient's rights in the Source Code form from
+ the rights set forth in this License. If You distribute the
+ Covered Software in Executable form under a different license, You
+ must make it absolutely clear that any terms which differ from
+ this License are offered by You alone, not by the Initial
+ Developer or Contributor. You hereby agree to indemnify the
+ Initial Developer and every Contributor for any liability incurred
+ by the Initial Developer or such Contributor as a result of any
+ such terms You offer.
+
+ 3.6. Larger Works.
+
+ You may create a Larger Work by combining Covered Software with
+ other code not governed by the terms of this License and
+ distribute the Larger Work as a single product. In such a case,
+ You must make sure the requirements of this License are fulfilled
+ for the Covered Software.
+
+ 4. Versions of the License.
+
+ 4.1. New Versions.
+
+ Sun Microsystems, Inc. is the initial license steward and may
+ publish revised and/or new versions of this License from time to
+ time. Each version will be given a distinguishing version number.
+ Except as provided in Section 4.3, no one other than the license
+ steward has the right to modify this License.
+
+ 4.2. Effect of New Versions.
+
+ You may always continue to use, distribute or otherwise make the
+ Covered Software available under the terms of the version of the
+ License under which You originally received the Covered Software.
+ If the Initial Developer includes a notice in the Original
+ Software prohibiting it from being distributed or otherwise made
+ available under any subsequent version of the License, You must
+ distribute and make the Covered Software available under the terms
+ of the version of the License under which You originally received
+ the Covered Software. Otherwise, You may also choose to use,
+ distribute or otherwise make the Covered Software available under
+ the terms of any subsequent version of the License published by
+ the license steward.
+
+ 4.3. Modified Versions.
+
+ When You are an Initial Developer and You want to create a new
+ license for Your Original Software, You may create and use a
+ modified version of this License if You: (a) rename the license
+ and remove any references to the name of the license steward
+ (except to note that the license differs from this License); and
+ (b) otherwise make it clear that the license contains terms which
+ differ from this License.
+
+ 5. DISCLAIMER OF WARRANTY.
+
+ COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS"
+ BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+ INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED
+ SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
+ PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND
+ PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY
+ COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
+ INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY
+ NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF
+ WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
+ ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
+ DISCLAIMER.
+
+ 6. TERMINATION.
+
+ 6.1. This License and the rights granted hereunder will terminate
+ automatically if You fail to comply with terms herein and fail to
+ cure such breach within 30 days of becoming aware of the breach.
+ Provisions which, by their nature, must remain in effect beyond
+ the termination of this License shall survive.
+
+ 6.2. If You assert a patent infringement claim (excluding
+ declaratory judgment actions) against Initial Developer or a
+ Contributor (the Initial Developer or Contributor against whom You
+ assert such claim is referred to as "Participant") alleging that
+ the Participant Software (meaning the Contributor Version where
+ the Participant is a Contributor or the Original Software where
+ the Participant is the Initial Developer) directly or indirectly
+ infringes any patent, then any and all rights granted directly or
+ indirectly to You by such Participant, the Initial Developer (if
+ the Initial Developer is not the Participant) and all Contributors
+ under Sections 2.1 and/or 2.2 of this License shall, upon 60 days
+ notice from Participant terminate prospectively and automatically
+ at the expiration of such 60 day notice period, unless if within
+ such 60 day period You withdraw Your claim with respect to the
+ Participant Software against such Participant either unilaterally
+ or pursuant to a written agreement with Participant.
+
+ 6.3. In the event of termination under Sections 6.1 or 6.2 above,
+ all end user licenses that have been validly granted by You or any
+ distributor hereunder prior to termination (excluding licenses
+ granted to You by any distributor) shall survive termination.
+
+ 7. LIMITATION OF LIABILITY.
+
+ UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+ (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
+ INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
+ COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
+ LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
+ CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
+ LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
+ STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
+ COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
+ INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+ LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL
+ INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT
+ APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO
+ NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
+ CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT
+ APPLY TO YOU.
+
+ 8. U.S. GOVERNMENT END USERS.
+
+ The Covered Software is a "commercial item," as that term is
+ defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
+ computer software" (as that term is defined at 48
+ C.F.R. 252.227-7014(a)(1)) and "commercial computer software
+ documentation" as such terms are used in 48 C.F.R. 12.212
+ (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48
+ C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all
+ U.S. Government End Users acquire Covered Software with only those
+ rights set forth herein. This U.S. Government Rights clause is in
+ lieu of, and supersedes, any other FAR, DFAR, or other clause or
+ provision that addresses Government rights in computer software
+ under this License.
+
+ 9. MISCELLANEOUS.
+
+ This License represents the complete agreement concerning subject
+ matter hereof. If any provision of this License is held to be
+ unenforceable, such provision shall be reformed only to the extent
+ necessary to make it enforceable. This License shall be governed
+ by the law of the jurisdiction specified in a notice contained
+ within the Original Software (except to the extent applicable law,
+ if any, provides otherwise), excluding such jurisdiction's
+ conflict-of-law provisions. Any litigation relating to this
+ License shall be subject to the jurisdiction of the courts located
+ in the jurisdiction and venue specified in a notice contained
+ within the Original Software, with the losing party responsible
+ for costs, including, without limitation, court costs and
+ reasonable attorneys' fees and expenses. The application of the
+ United Nations Convention on Contracts for the International Sale
+ of Goods is expressly excluded. Any law or regulation which
+ provides that the language of a contract shall be construed
+ against the drafter shall not apply to this License. You agree
+ that You alone are responsible for compliance with the United
+ States export administration regulations (and the export control
+ laws and regulation of any other countries) when You use,
+ distribute or otherwise make available any Covered Software.
+
+ 10. RESPONSIBILITY FOR CLAIMS.
+
+ As between Initial Developer and the Contributors, each party is
+ responsible for claims and damages arising, directly or
+ indirectly, out of its utilization of rights under this License
+ and You agree to work with Initial Developer and Contributors to
+ distribute such responsibility on an equitable basis. Nothing
+ herein is intended or shall be deemed to constitute any admission
+ of liability.
+
+ --------------------------------------------------------------------
+
+ NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND
+ DISTRIBUTION LICENSE (CDDL)
+
+ For Covered Software in this distribution, this License shall
+ be governed by the laws of the State of California (excluding
+ conflict-of-law provisions).
+
+ Any litigation relating to this License shall be subject to the
+ jurisdiction of the Federal Courts of the Northern District of
+ California and the state courts of the State of California, with
+ venue lying in Santa Clara County, California.
+
Sources/Binaries in the following directories are licensed under
DFSG-incompatible terms and were therefore removed from the package
(and disabled in the build system):
Added: trunk/kfreebsd-8/debian/kfreebsd-image.README.Debian
===================================================================
--- trunk/kfreebsd-8/debian/kfreebsd-image.README.Debian (rev 0)
+++ trunk/kfreebsd-8/debian/kfreebsd-image.README.Debian 2009-08-30 07:45:00 UTC (rev 2750)
@@ -0,0 +1,15 @@
+kfreebsd-image for Debian
+-------------------------
+
+This package contain the FreeBSD kernel and various modules. Among them
+ext2fs.ko, reiserfs.ko and xfs.ko distributed under the terms of the GPL
+version 2. zfs.ko is distributed under the terms of the CDDL. Both
+licenses are not compatible according to the Free Software Fondation.
+
+While it is legaly possible to distribute both modules (they are not
+linked together), it may not be legaly possible to load them at the same
+time (dynamic linking).
+
+[1] http://www.gnu.org/licenses/license-list.html
+
+ -- Aurelien Jarno <aurel32 at debian.org> Mon, 10 Aug 2009 10:51:55 +0200
Modified: trunk/kfreebsd-8/debian/kfreebsd-image.overrides
===================================================================
--- trunk/kfreebsd-8/debian/kfreebsd-image.overrides 2009-08-30 07:42:52 UTC (rev 2749)
+++ trunk/kfreebsd-8/debian/kfreebsd-image.overrides 2009-08-30 07:45:00 UTC (rev 2750)
@@ -1,3 +1,3 @@
shlib-with-non-pic-code
shared-lib-without-dependency-information
-
+embedded-zlib
Modified: trunk/kfreebsd-8/debian/kfreebsd-image.postinst.in
===================================================================
--- trunk/kfreebsd-8/debian/kfreebsd-image.postinst.in 2009-08-30 07:42:52 UTC (rev 2749)
+++ trunk/kfreebsd-8/debian/kfreebsd-image.postinst.in 2009-08-30 07:45:00 UTC (rev 2750)
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /bin/sh
# postinst script
#
# see: dh_installdeb(1)
@@ -17,35 +17,51 @@
# the debian-policy package
#
+PATH="/sbin:/bin:/usr/sbin:/usr/bin"
+KERNEL_IMG_CONF="/etc/kernel-img.conf"
+RELEASE="@RELEASE@"
+VERSION="@VERSION@"
+
case "$1" in
configure)
- for i in kernel.gz acpi.ko ; do
- if test -e /boot/kernel/$i && ! test -L /boot/kernel/$i ; then
- echo "What happen!! /boot/kernel/$i exists but is not a symlink."
- exit 1
- fi
- done
-
- if [ "$(readlink -f /boot/kernel/kernel.gz)" != "/boot/kfreebsd- at RELEASE@.gz" ] ; then
- rm -f /boot/kernel/kernel{,.gz}.old{,.gz}
- if [ -L /boot/kernel/kernel.gz ] ; then
- mv /boot/kernel/kernel{,.old}.gz
- fi
- ln -s /boot/kfreebsd- at RELEASE@.gz /boot/kernel/kernel.gz
- fi
-
- # acpi MUST be within kfreebsd-loader reach
- if [ "$(readlink -f /boot/kernel/acpi.ko)" != "/lib/modules/@RELEASE@/acpi.ko" ] ; then
- rm -f /boot/kernel/acpi.ko.old
- if [ -L /boot/kernel/acpi.ko ] ; then
- mv /boot/kernel/acpi.ko{,.old}
- fi
- ln -s /lib/modules/@RELEASE@/acpi.ko /boot/kernel/acpi.ko
- fi
+ # Don't do symlinks if explicitely disabled
+ if [ -z "$(sed -e '/^\s*do_symlinks\s*=\s*\(no\|false\|0\)\s*$/!d' $KERNEL_IMG_CONF 2>/dev/null)" ] ; then
+ for i in kernel.gz acpi.ko ; do
+ if test -e /boot/kernel/$i && ! test -L /boot/kernel/$i ; then
+ echo "What happen!! /boot/kernel/$i exists but is not a symlink."
+ exit 1
+ fi
+ done
+
+ if [ "$(readlink -f /boot/kernel/kernel.gz)" != "/boot/kfreebsd-$RELEASE.gz" ] ; then
+ rm -f /boot/kernel/kernel.old.gz
+ if [ -L /boot/kernel/kernel.gz ] ; then
+ mv /boot/kernel/kernel.gz /boot/kernel/kernel.old.gz
+ fi
+ ln -s /boot/kfreebsd-$RELEASE.gz /boot/kernel/kernel.gz
+ fi
+
+ # on i386 acpi MUST be within kfreebsd-loader reach
+ if [ "${RELEASE%%-[456]86}" != "${RELEASE}" ] ; then
+ if [ "$(readlink -f /boot/kernel/acpi.ko)" != "/lib/modules/$RELEASE/acpi.ko" ] ; then
+ rm -f /boot/kernel/acpi.ko.old
+ if [ -L /boot/kernel/acpi.ko ] ; then
+ mv /boot/kernel/acpi.ko /boot/kernel/acpi.ko.old
+ fi
+ ln -s /lib/modules/$RELEASE/acpi.ko /boot/kernel/acpi.ko
+ fi
+ fi
+ fi
+
+ # Run postinst hook if defined
+ postinst_hook=$(sed '/^\s*postinst_hook/!d;s/.*=\s*//' $KERNEL_IMG_CONF 2>/dev/null || true)
+ if [ -n "$postinst_hook" ] ; then
+ echo "Running postinst hook script $postinst_hook." 1>&2
+ $postinst_hook "$VERSION" "/boot/kfreebsd-$RELEASE.gz"
+ fi
;;
-
+
abort-upgrade|abort-remove|abort-deconfigure)
-
;;
*)
Added: trunk/kfreebsd-8/debian/kfreebsd-image.postrm.in
===================================================================
--- trunk/kfreebsd-8/debian/kfreebsd-image.postrm.in (rev 0)
+++ trunk/kfreebsd-8/debian/kfreebsd-image.postrm.in 2009-08-30 07:45:00 UTC (rev 2750)
@@ -0,0 +1,50 @@
+#!/bin/sh
+# postrm script
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <postrm> `remove'
+# * <postrm> `purge'
+# * <old-postrm> `upgrade' <new-version>
+# * <new-postrm> `failed-upgrade' <old-version>
+# * <new-postrm> `abort-install'
+# * <new-postrm> `abort-install' <old-version>
+# * <new-postrm> `abort-upgrade' <old-version>
+# * <disappearer's-postrm> `disappear' <overwriter>
+# <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+PATH="/sbin:/bin:/usr/sbin:/usr/bin"
+KERNEL_IMG_CONF="/etc/kernel-img.conf"
+RELEASE="@RELEASE@"
+VERSION="@VERSION@"
+
+case "$1" in
+ remove)
+ # Run postrm hook if defined
+ postrm_hook=$(sed '/^\s*postrm_hook/!d;s/.*=\s*//' $KERNEL_IMG_CONF 2>/dev/null || true)
+ if [ -n "$postrm_hook" ] ; then
+ echo "Running postrm hook script $postrm_hook." 1>&2
+ $postrm_hook "$VERSION" "/boot/kfreebsd-$RELEASE.gz"
+ fi
+ ;;
+
+ purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+ ;;
+
+ *)
+ echo "postrm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
Added: trunk/kfreebsd-8/debian/kfreebsd-image.preinst.in
===================================================================
--- trunk/kfreebsd-8/debian/kfreebsd-image.preinst.in (rev 0)
+++ trunk/kfreebsd-8/debian/kfreebsd-image.preinst.in 2009-08-30 07:45:00 UTC (rev 2750)
@@ -0,0 +1,45 @@
+#!/bin/sh
+# preinst script
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <new-preinst> `install'
+# * <new-preinst> `install' <old-version>
+# * <new-preinst> `upgrade' <old-version>
+# * <old-preinst> `abort-upgrade' <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+PATH="/sbin:/bin:/usr/sbin:/usr/bin"
+KERNEL_IMG_CONF="/etc/kernel-img.conf"
+RELEASE="@RELEASE@"
+VERSION="@VERSION@"
+
+case "$1" in
+ install|upgrade)
+ # Run preinst hook if defined
+ preinst_hook=$(sed '/^\s*preinst_hook/!d;s/.*=\s*//' $KERNEL_IMG_CONF 2>/dev/null || true)
+ if [ -n "$preinst_hook" ] ; then
+ echo "Running preinst hook script $preinst_hook." 1>&2
+ $preinst_hook "$VERSION" "/boot/kfreebsd-$RELEASE.gz"
+ fi
+ ;;
+
+ abort-upgrade)
+ ;;
+
+ *)
+ echo "preinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
Added: trunk/kfreebsd-8/debian/kfreebsd-image.prerm.in
===================================================================
--- trunk/kfreebsd-8/debian/kfreebsd-image.prerm.in (rev 0)
+++ trunk/kfreebsd-8/debian/kfreebsd-image.prerm.in 2009-08-30 07:45:00 UTC (rev 2750)
@@ -0,0 +1,48 @@
+#!/bin/sh
+# prerm script
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <prerm> `remove'
+# * <old-prerm> `upgrade' <new-version>
+# * <new-prerm> `failed-upgrade' <old-version>
+# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+# * <deconfigured's-prerm> `deconfigure' `in-favour'
+# <package-being-installed> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+PATH="/sbin:/bin:/usr/sbin:/usr/bin"
+KERNEL_IMG_CONF="/etc/kernel-img.conf"
+RELEASE="@RELEASE@"
+VERSION="@VERSION@"
+
+case "$1" in
+ remove)
+ # Run prerm hook if defined
+ prerm_hook=$(sed '/^\s*prerm_hook/!d;s/.*=\s*//g' $KERNEL_IMG_CONF 2>/dev/null || true)
+ if [ -n "$prerm_hook" ] ; then
+ echo "Running prerm hook script $prerm_hook." 1>&2
+ $prerm_hook "$VERSION" "/boot/kfreebsd-$RELEASE.gz"
+ fi
+ ;;
+
+ failed-upgrade|upgrade|deconfigure)
+ ;;
+
+ *)
+ echo "prerm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
Modified: trunk/kfreebsd-8/debian/patches/903_disable_non-free_drivers.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/903_disable_non-free_drivers.diff 2009-08-30 07:42:52 UTC (rev 2749)
+++ trunk/kfreebsd-8/debian/patches/903_disable_non-free_drivers.diff 2009-08-30 07:45:00 UTC (rev 2750)
@@ -73,7 +73,7 @@
hwpmc \
${_i2c} \
${_ibcs2} \
-@@ -202,11 +200,9 @@
+@@ -202,7 +200,6 @@
ntfs \
ntfs_iconv \
nullfs \
@@ -81,38 +81,6 @@
${_nvram} \
${_nwfs} \
${_nxge} \
-- ${_opensolaris} \
- ${_padlock} \
- patm \
- ${_pccard} \
-@@ -297,7 +293,6 @@
- ${_xe} \
- xfs \
- xl \
-- ${_zfs} \
- zlib \
-
- .if ${MACHINE_ARCH} != "powerpc"
-@@ -381,9 +376,6 @@
- .if ${MK_NCP} != "no"
- _nwfs= nwfs
- .endif
--.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
--_opensolaris= opensolaris
--.endif
- _pccard= pccard
- _pcfclock= pcfclock
- _pst= pst
-@@ -402,9 +394,6 @@
- _tmpfs= tmpfs
- _wi= wi
- _xe= xe
--.if ${MK_ZFS} != "no" || defined(ALL_MODULES)
--_zfs= zfs
--.endif
- .if ${MACHINE} == "i386"
- _aac= aac
- _acpi= acpi
@@ -422,8 +411,6 @@
_dpt= dpt
_ex= ex
@@ -139,29 +107,14 @@
_i2c= i2c
_ichwd= ichwd
_ida= ida
-@@ -509,12 +493,8 @@
+@@ -509,7 +493,6 @@
_mly= mly
_ndis= ndis
_nfe= nfe
-_nve= nve
_nvram= nvram
_nxge= nxge
--.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
--_opensolaris= opensolaris
--.endif
- .if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
- .if exists(${.CURDIR}/../crypto/via)
- _padlock= padlock
-@@ -533,9 +513,6 @@
- _wi= wi
- _wpi= wpi
- _wpifw= wpifw
--.if ${MK_ZFS} != "no" || defined(ALL_MODULES)
--_zfs= zfs
--.endif
- .endif
-
- .if ${MACHINE_ARCH} == "ia64"
+ .if ${MK_CDDL} != "no" || defined(ALL_MODULES)
--- src.orig/sys/amd64/conf/GENERIC
+++ src/sys/amd64/conf/GENERIC
@@ -145,8 +145,6 @@
Added: trunk/kfreebsd-8/debian/patches/914_psm.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/914_psm.diff (rev 0)
+++ trunk/kfreebsd-8/debian/patches/914_psm.diff 2009-08-30 07:45:00 UTC (rev 2750)
@@ -0,0 +1,75 @@
+This patch fixes PS/2 mouse support with xserver-xorg-input-mouse 1.4.0.
+It is a revert of upstream commit r18970:
+
+| Teach psm about O_ASYNC
+|
+| This makes Xorg happy if you aren't using moused.
+
+--- src.orig/sys/dev/atkbdc/psm.c
++++ src/sys/dev/atkbdc/psm.c
+@@ -70,10 +70,7 @@
+ #include <sys/module.h>
+ #include <sys/bus.h>
+ #include <sys/conf.h>
+-#include <sys/filio.h>
+ #include <sys/poll.h>
+-#include <sys/sigio.h>
+-#include <sys/signalvar.h>
+ #include <sys/syslog.h>
+ #include <machine/bus.h>
+ #include <sys/rman.h>
+@@ -215,7 +212,6 @@
+ struct cdev *bdev;
+ int lasterr;
+ int cmdcount;
+- struct sigio *async; /* Processes waiting for SIGIO */
+ };
+ static devclass_t psm_devclass;
+ #define PSM_SOFTC(unit) \
+@@ -1387,7 +1383,6 @@
+ sc->mode.level = sc->dflt_mode.level;
+ sc->mode.protocol = sc->dflt_mode.protocol;
+ sc->watchdog = FALSE;
+- sc->async = NULL;
+
+ /* flush the event queue */
+ sc->queue.count = 0;
+@@ -1527,12 +1522,6 @@
+ /* remove anything left in the output buffer */
+ empty_aux_buffer(sc->kbdc, 10);
+
+- /* clean up and sigio requests */
+- if (sc->async != NULL) {
+- funsetown(&sc->async);
+- sc->async = NULL;
+- }
+-
+ /* close is almost always successful */
+ sc->state &= ~PSM_OPEN;
+ kbdc_lock(sc->kbdc, FALSE);
+@@ -2094,15 +2083,6 @@
+ break;
+ #endif /* MOUSE_GETHWID */
+
+- case FIONBIO:
+- case FIOASYNC:
+- break;
+- case FIOSETOWN:
+- error = fsetown(*(int *)addr, &sc->async);
+- break;
+- case FIOGETOWN:
+- *(int *) addr = fgetown(&sc->async);
+- break;
+ default:
+ return (ENOTTY);
+ }
+@@ -2992,9 +2972,6 @@
+ wakeup(sc);
+ }
+ selwakeuppri(&sc->rsel, PZERO);
+- if (sc->async != NULL) {
+- pgsigio(&sc->async, SIGIO, 0);
+- }
+ sc->state &= ~PSM_SOFTARMED;
+ splx(s);
+ }
Modified: trunk/kfreebsd-8/debian/rules
===================================================================
--- trunk/kfreebsd-8/debian/rules 2009-08-30 07:42:52 UTC (rev 2749)
+++ trunk/kfreebsd-8/debian/rules 2009-08-30 07:45:00 UTC (rev 2750)
@@ -45,7 +45,10 @@
dh_testdir
dh_testroot
rm -rf .pc src kfreebsd-source-* flavor-* config
+ rm -f debian/kfreebsd-image-*.preinst
+ rm -f debian/kfreebsd-image-*.prerm
rm -f debian/kfreebsd-image-*.postinst
+ rm -f debian/kfreebsd-image-*.postrm
rm -f *-stamp
dh_clean
@@ -184,6 +187,12 @@
# remove device.hints (built into kernel)
rm -f $(IMAGE_PACKAGE)-$*/boot/device.hints
+ # README file
+ mkdir -p $(IMAGE_PACKAGE)-$*/usr/share/doc/$(IMAGE_PACKAGE)-$*
+ install -p -o root -g root -m 644 \
+ debian/kfreebsd-image.README.Debian \
+ $(IMAGE_PACKAGE)-$*/usr/share/doc/$(IMAGE_PACKAGE)-$*/README.Debian
+
# override file
mkdir -p $(IMAGE_PACKAGE)-$*/usr/share/lintian/overrides
install -p -o root -g root -m 644 \
@@ -191,8 +200,12 @@
$(IMAGE_PACKAGE)-$*/usr/share/lintian/overrides/kfreebsd-image-$(version)-$(abiname)-$*
# scripts
- sed -e "s/@RELEASE@/$(version)-$(abiname)-$*/g" debian/kfreebsd-image.postinst.in \
- > debian/kfreebsd-image-$(version)-$(abiname)-$*.postinst
+ for script in preinst prerm postinst postrm ; do \
+ sed -e "s/@VERSION@/$(version)/g" \
+ -e "s/@RELEASE@/$(version)-$(abiname)-$*/g" \
+ debian/kfreebsd-image.$$script.in \
+ > debian/kfreebsd-image-$(version)-$(abiname)-$*.$$script ; \
+ done
# headers package
mkdir -p $(HEADERS_PACKAGE)-$*/usr/src/$(HEADERS_DIR)-$*/sys/$(cpu)
More information about the Glibc-bsd-commits
mailing list