[Pkg-mol-commits] r14 - in mol/trunk/debian: . patches
Gaudenz Steinlin
gaudenz at costa.debian.org
Sat Aug 19 12:17:27 UTC 2006
Author: gaudenz
Date: 2006-08-19 12:17:26 +0000 (Sat, 19 Aug 2006)
New Revision: 14
Added:
mol/trunk/debian/patches/
mol/trunk/debian/patches/00list
mol/trunk/debian/patches/Makefile.dpatch
mol/trunk/debian/patches/Makefile_netdriver.dpatch
mol/trunk/debian/patches/if-tap.dpatch
mol/trunk/debian/patches/kernelsrc.dpatch
mol/trunk/debian/patches/modload.dpatch
Modified:
mol/trunk/debian/changelog
mol/trunk/debian/control
mol/trunk/debian/mol-modules-source.README.Debian
mol/trunk/debian/rules
Log:
* Acknowledge NMU, Thanks to Wouter and Victor, (Closes: #343944)
* New upstream version
- patch to avoid setpriority (closes: #333073, #330294)
* Remove non-free content from upstream tarball
* convert diff.gz changes to dpatch
* remove autotools dependency, upstream now includes ./configure
* add myself to uploaders
* change Suggests of mol-modules-source from kernel-* to linux-*
* correct documentation in mol-modules-source.README.Debian
Modified: mol/trunk/debian/changelog
===================================================================
--- mol/trunk/debian/changelog 2006-08-19 12:11:07 UTC (rev 13)
+++ mol/trunk/debian/changelog 2006-08-19 12:17:26 UTC (rev 14)
@@ -1,8 +1,7 @@
-mol (0.9.70-21) UNRELEASED; urgency=low
+mol (0.9.71~pre8-1) UNRELEASED; urgency=low
[ Otavio Salvador ]
- * Applied patch to avoid setpriority since it 'cause problems with new
- kernels. Used Gentoo patch for it. (closes: #333073, #330294)
+
* debian/control:
- Maintainer: MOL Packaging Team <pkg-mol-devel at lists.alioth.debian.org>
- Uploaders: Sven Luther <luther at debian.org>,
@@ -12,13 +11,32 @@
- debian/rules: remove level 3 setting;
- debian/control: depends of debhelper (>>4.0)
-
+
* Debconf Translations:
- Vietnamese (vi.po). Thanks to Clytie Siddall <clytie at riverland.net.au>
(closes: #312959)
- -- Otavio Salvador <otavio at debian.org> Sat, 26 Nov 2005 12:15:55 -0200
+ [ Gaudenz Steinlin ]
+ * Acknowledge NMU, Thanks to Wouter and Victor, (Closes: #343944)
+ * New upstream version
+ - patch to avoid setpriority (closes: #333073, #330294)
+ * Remove non-free content from upstream tarball
+ * convert diff.gz changes to dpatch
+ * remove autotools dependency, upstream now includes ./configure
+ * add myself to uploaders
+ * change Suggests of mol-modules-source from kernel-* to linux-*
+ * correct documentation in mol-modules-source.README.Debian
+
+ -- Gaudenz Steinlin <gaudenz at debian.org> Sun, 9 Jul 2006 15:23:47 +0200
+
+mol (0.9.70-20.1) unstable; urgency=low
+
+ * NMU
+ * Updated build-dependencies for xlibs-dev transition. Closes: #343944.
+
+ -- Wouter Verhelst <wouter at debian.org> Wed, 18 Jan 2006 22:11:00 +0100
+
mol (0.9.70-20) unstable; urgency=low
* Fixed a bunch of gcc-4.0 and/or new binutils-asm build errors :/
Modified: mol/trunk/debian/control
===================================================================
--- mol/trunk/debian/control 2006-08-19 12:11:07 UTC (rev 13)
+++ mol/trunk/debian/control 2006-08-19 12:17:26 UTC (rev 14)
@@ -2,8 +2,8 @@
Section: otherosfs
Priority: optional
Maintainer: MOL Packaging Team <pkg-mol-devel at lists.alioth.debian.org>
-Uploaders: Sven Luther <luther at debian.org>, Otavio Salvador <otavio at debian.org>
-Build-Depends: debhelper (>> 4.0.0), autoconf, automake1.7 | automaken, binutils-dev, bison, docbook-to-man, flex, imagemagick, libasound2-dev, libesd0-dev, libncurses5-dev, po-debconf, xlibs-dev
+Uploaders: Sven Luther <luther at debian.org>, Otavio Salvador <otavio at debian.org>, Gaudenz Steinlin <gaudenz at debian.org>
+Build-Depends: debhelper (>> 4.0.0), binutils-dev, bison, docbook-to-man, flex, imagemagick, libasound2-dev, libesd0-dev, libncurses5-dev, po-debconf, libxt-dev, libxxf86dga-dev, dpatch
Standards-Version: 3.6.1.1
Package: mol
@@ -30,7 +30,7 @@
Architecture: any
Depends: gcc, libc6-dev, make
Recommends: debhelper, kernel-package, m4
-Suggests: kernel-headers | kernel-source
+Suggests: linux-headers | linux-source
Description: The Mac-on-Linux emulator - source for kernel modules
.
Mac-on-Linux is basically an emulator capable of running
Modified: mol/trunk/debian/mol-modules-source.README.Debian
===================================================================
--- mol/trunk/debian/mol-modules-source.README.Debian 2006-08-19 12:11:07 UTC (rev 13)
+++ mol/trunk/debian/mol-modules-source.README.Debian 2006-08-19 12:17:26 UTC (rev 14)
@@ -20,7 +20,7 @@
and mol modules. The variables KVERS and KSRC contain the version
number of your kernel and the location of your kernel source tree,
respectively. Unless they are set by the environment or via the
- commandline, Makefile.common assigns reasonable defaults.
+ commandline, the top level Makefile assigns reasonable defaults.
* Compiling the modules with kernel-package
Added: mol/trunk/debian/patches/00list
===================================================================
--- mol/trunk/debian/patches/00list 2006-08-19 12:11:07 UTC (rev 13)
+++ mol/trunk/debian/patches/00list 2006-08-19 12:17:26 UTC (rev 14)
@@ -0,0 +1,4 @@
+kernelsrc
+Makefile
+modload
+if-tap
Added: mol/trunk/debian/patches/Makefile.dpatch
===================================================================
--- mol/trunk/debian/patches/Makefile.dpatch 2006-08-19 12:11:07 UTC (rev 13)
+++ mol/trunk/debian/patches/Makefile.dpatch 2006-08-19 12:17:26 UTC (rev 14)
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## Makefile.dpatch by <gaudenz at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Remove installation of non-free parts from Makefile
+
+ at DPATCH@
+
+--- mol-0.9.70.orig/Makefile.dist
++++ mol-0.9.70/Makefile.dist
+@@ -102,14 +102,7 @@
+
+ @$(INSTALL_DATA) -v $(mollib)/mol.symbols $(_libdir)/
+
+- @$(INSTALL_DATA) COPYING COPYRIGHT CREDITS $(_docdir)/
+- @$(INSTALL_DATA) $(molshare)/drivers/*.nw $(_datadir)/drivers/
+- @$(INSTALL_DATA) $(molshare)/drivers/*.ow $(_datadir)/drivers/
+- @$(INSTALL_DATA) $(molshare)/drivers/*.x $(_datadir)/drivers/
+- @$(INSTALL_DATA) $(molshare)/drivers/*.mkext $(_datadir)/drivers/
+- @$(INSTALL_DATA) $(molshare)/drivers/bootx $(_datadir)/drivers/
+- @$(INSTALL_DATA) $(molshare)/drivers/of $(_datadir)/drivers/
+- @$(INSTALL_DATA) $(molshare)/drivers/openbios $(_datadir)/drivers/
++ @$(INSTALL_DATA) CREDITS $(_docdir)/
+ @$(INSTALL_DATA) $(molshare)/images/*.dmg $(_datadir)/images/
+ @$(INSTALL_DATA) $(molshare)/startboing $(_datadir)/startboing
+ @$(INSTALL_DATA) $(molshare)/graphics/*.raw $(_datadir)/graphics/
Property changes on: mol/trunk/debian/patches/Makefile.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: mol/trunk/debian/patches/Makefile_netdriver.dpatch
===================================================================
--- mol/trunk/debian/patches/Makefile_netdriver.dpatch 2006-08-19 12:11:07 UTC (rev 13)
+++ mol/trunk/debian/patches/Makefile_netdriver.dpatch 2006-08-19 12:17:26 UTC (rev 14)
@@ -0,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## Makefile_netdriver.dpatch by <gaudenz at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Don't build tun and tap drivers. They are only needed for Linux 2.4
+
+ at DPATCH@
+diff -urNad mol-0.9.71_pre8.orig~/src/netdriver/Makefile mol-0.9.71_pre8.orig/src/netdriver/Makefile
+--- mol-0.9.71_pre8.orig~/src/netdriver/Makefile 2006-07-09 02:01:49.000000000 +0200
++++ mol-0.9.71_pre8.orig/src/netdriver/Makefile 2006-07-09 02:09:28.000000000 +0200
+@@ -20,14 +20,8 @@
+ @ln -sf dir1/Makefile.$(LV) $(ODIR)/Makefile
+
+ setup-tree-26: setup-tree-common
+- @for x in tun.c ethertap.c ; do \
+- ln -sf $(KERNEL_SOURCE)/drivers/net/$$x $(ODIR)/ || exit 1 ; \
+- done
+
+ setup-tree-24: setup-tree-common
+- @for x in tun.c ethertap.c if_tun.h ; do \
+- ln -sf dir1/$$x $(ODIR)/ || exit 1 ; \
+- done
+
+ all-local: setup-tree-$(LV)
+ @$(MAKE) --no-print-directory -C $(KERNEL_SOURCE) "SUBDIRS=$(ABSODIR)" \
Property changes on: mol/trunk/debian/patches/Makefile_netdriver.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: mol/trunk/debian/patches/if-tap.dpatch
===================================================================
--- mol/trunk/debian/patches/if-tap.dpatch 2006-08-19 12:11:07 UTC (rev 13)
+++ mol/trunk/debian/patches/if-tap.dpatch 2006-08-19 12:17:26 UTC (rev 14)
@@ -0,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## if-tap.dpatch by <gaudenz at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Ugliest patch ever to make the build not fail. The tap driver should be removed completely.
+
+ at DPATCH@
+diff -urNad mol-0.9.71_pre8.orig~/src/drivers/net/if-tap.c mol-0.9.71_pre8.orig/src/drivers/net/if-tap.c
+--- mol-0.9.71_pre8.orig~/src/drivers/net/if-tap.c 2005-01-18 00:07:06.000000000 +0100
++++ mol-0.9.71_pre8.orig/src/drivers/net/if-tap.c 2006-07-09 02:37:56.000000000 +0200
+@@ -22,6 +22,13 @@
+ #include "enet.h"
+ #include "res_manager.h"
+
++/* including definition previously found in linux/netlink.h here to make it
++ * complie again. This will not make if-tap work again...
++ */
++#ifndef NETLINK_TAPBASE
++#define NETLINK_TAPBASE 16 /* 16 to 31 are ethertap */
++#endif
++
+ static const char def_hw_addr[6] = { 0, 0, 0xDE, 0xAD, 0xBE, 0xEF };
+
+ static void
Property changes on: mol/trunk/debian/patches/if-tap.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: mol/trunk/debian/patches/kernelsrc.dpatch
===================================================================
--- mol/trunk/debian/patches/kernelsrc.dpatch 2006-08-19 12:11:07 UTC (rev 13)
+++ mol/trunk/debian/patches/kernelsrc.dpatch 2006-08-19 12:17:26 UTC (rev 14)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## kernelsrc.dpatch by <gaudenz at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Do not overwrite $KERNEL_SOURCE in scripts/kernelsrc
+
+ at DPATCH@
+
+--- mol-0.9.70.orig/scripts/kernelsrc
++++ mol-0.9.70/scripts/kernelsrc
+@@ -6,7 +6,7 @@
+
+ function headercheck()
+ {
+- KERNEL_SOURCE="/lib/modules/`uname -r`/build"
++ test -d $KERNEL_SOURCE || KERNEL_SOURCE="/lib/modules/`uname -r`/build"
+ test -d $KERNEL_SOURCE || KERNEL_SOURCE=/usr/src/linux
+
+ if ! test -d $KERNEL_SOURCE ; then
Property changes on: mol/trunk/debian/patches/kernelsrc.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: mol/trunk/debian/patches/modload.dpatch
===================================================================
--- mol/trunk/debian/patches/modload.dpatch 2006-08-19 12:11:07 UTC (rev 13)
+++ mol/trunk/debian/patches/modload.dpatch 2006-08-19 12:17:26 UTC (rev 14)
@@ -0,0 +1,76 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## modload.dpatch by <gaudenz at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Change modload script to use modprobe and to give debian specific error
+## DP: messages
+
+ at DPATCH@
+
+--- mol-0.9.70.orig/scripts/modload
++++ mol-0.9.70/scripts/modload
+@@ -101,15 +101,13 @@
+ ###################################################
+
+ function load_mol_module () {
+- MOL_MOD=`get_mod_name mol` || exit $?
++ echo "Loading Mac-on-Linux kernel module:"
+
+- echo -e "Loading Mac-on-Linux kernel module:\n $MOL_MOD"
+-
+- /sbin/insmod -f $MOL_MOD || {
++ /sbin/modprobe -v mol || {
+ echo "===================================================================="
+- echo " Failed to load the module - try recompiling the MOL kernel"
+- echo " module. Instructions (and information about common problems)"
+- echo " are available at <http://www.maconlinux.org>."
++ echo " Failed to load the Mac-on-Linux kernel module -- please install "
++ echo " mol-modules-source and build your own, or find a binary package "
++ echo " providing mol-modules for your running kernel. "
+ echo "===================================================================="
+ echo
+ exit 1
+@@ -123,10 +121,9 @@
+ ###################################################
+
+ function load_mod () {
+- MOD=`get_mod_name $1` || return $?
+- echo -e "Loading" $2 "kernel module:\n $MOD"
++ echo "Loading $2 kernel module:"
+
+- /sbin/insmod -f $MOD
++ /sbin/modprobe -v $1
+ }
+
+
+@@ -135,7 +132,7 @@
+ ###################################################
+
+ function sheep_check () {
+- [ ! -c /dev/sheep_net ] && {
++ [ ! -c /dev/sheep_net -a ! -e /dev/.devfsd -a ! -e /dev/.udev.tdb ] && {
+ echo "Creating the /dev/sheep_net device node."
+ mknod --mode=600 /dev/sheep_net c 10 198
+ }
+@@ -143,7 +140,7 @@
+ }
+
+ function tun_check () {
+- [ ! -c /dev/net/tun ] && {
++ [ ! -c /dev/net/tun -a ! -e /dev/.devfsd -a ! -e /dev/.udev.tdb ] && {
+ echo "Creating the /dev/net/tun device node."
+ [ -d /dev/net ] || mkdir --mode 755 /dev/net
+ mknod --mode=600 /dev/net/tun c 10 200
+@@ -157,8 +154,10 @@
+ echo "Failed to extract the MOL device number"
+ exit 1
+ }
+- rm -f /dev/mol
+- mknod --mode=600 /dev/mol c 10 "$MINOR"
++ [ ! -c /dev/mol ] && {
++ rm -f /dev/mol
++ mknod --mode=600 /dev/mol c 10 "$MINOR"
++ }
+ }
+
+
Property changes on: mol/trunk/debian/patches/modload.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: mol/trunk/debian/rules
===================================================================
--- mol/trunk/debian/rules 2006-08-19 12:11:07 UTC (rev 13)
+++ mol/trunk/debian/rules 2006-08-19 12:17:26 UTC (rev 14)
@@ -5,6 +5,9 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+# include dpatch rules
+include /usr/share/dpatch/dpatch.make
+
# Debian specific flags to make,, mostly installation directories
DEBIANFLAGS=\
prefix=/usr \
@@ -13,11 +16,10 @@
docdir=/usr/share/doc/mol
configure: configure-stamp
-configure-stamp:
+configure-stamp: patch
dh_testdir
# configure the package.
- ./autogen.sh
CFLAGS="$$CFLAGS -D_FILE_OFFSET_BITS=64" ./configure --disable-png
yes '' | make config
@@ -35,7 +37,8 @@
touch build-stamp
-clean:
+clean: clean-patched unpatch
+clean-patched:
dh_testdir
dh_testroot
rm -f configure-stamp build-stamp
@@ -44,13 +47,14 @@
rm -f *.[17]
# clean the package, including auto-generated stuff that distclean overlooks
- -$(MAKE) distclean
- rm -f .config.cmd .config.old
- cd src/vconfig; rm -f modes-y.c modes-y.h modes-l.c
- rm -f src/shared/config.h.in
- rm -f src/kmod/mpc107/Makefile src/cpu/mpc107/Makefile src/cpu/ppc/asm_offsets.h
- rm -f mollib/mol.symbols
- cd config/kconfig; rm -rf zconf-y.c zconf-y.h zconf-l.c .autoinclude
+ -$(MAKE) clean
+ rm -rf obj-ppc
+# rm -f .config.cmd .config.old
+# cd src/vconfig; rm -f modes-y.c modes-y.h modes-l.c
+# rm -f src/shared/config.h.in
+# rm -f src/kmod/mpc107/Makefile src/cpu/mpc107/Makefile src/cpu/ppc/asm_offsets.h
+# rm -f mollib/mol.symbols
+# cd config/kconfig; rm -rf zconf-y.c zconf-y.h zconf-l.c .autoinclude
# remove the modules source directory and tarball
rm -rf modules
@@ -70,11 +74,6 @@
# install the Mac-on-Linux emulator into mol.
$(MAKE) DESTDIR=`pwd`/debian/mol $(DEBIANFLAGS) install
-# get rid of unnecessary absolute links
- rm `pwd`/debian/mol/usr/bin/mol
- ln -sf ../lib/mol/bin/startmol `pwd`/debian/mol/usr/bin
- ln -sf ../lib/mol/bin/molrcget `pwd`/debian/mol/usr/bin
-
# fix permissions
chmod 644 `pwd`/debian/mol/usr/lib/mol/mol.symbols
@@ -85,7 +84,8 @@
mkdir -p modules/mol/src modules/mol/scripts
cp -pr src/kmod src/netdriver src/shared src/include modules/mol/src
cp -pr scripts/kernelsrc scripts/mol_uname modules/mol/scripts
- cp -pr Makefile.top Rules.make config .config .inc-ppc modules/mol
+ cp -pr config modules/mol
+# cp -pr .config .inc-ppc modules/mol
# add the Debian directory and the top-level Makefile
cp -pr debian/debian.mol-modules-source modules/mol/debian
@@ -103,9 +103,9 @@
install -o root -g root -m 644 mol-modules.tar.gz `pwd`/debian/mol-modules-source/usr/src
# create the mol-modules packages by moving the installed modules
- dh_movefiles --sourcedir=debian/mol
+# dh_movefiles --sourcedir=debian/mol
# remove the now empty directory
- rm -rf `pwd`/debian/mol/lib
+# rm -rf `pwd`/debian/mol/lib
# Build architecture-independent files here.
binary-indep: build install
More information about the Pkg-mol-commits
mailing list