Hello community, here is the log from the commit of package mol checked in at Wed Jul 19 19:20:26 CEST 2006. -------- --- arch/ppc/mol/mol.changes 2006-01-25 21:44:56.000000000 +0100 +++ mol/mol.changes 2006-07-19 14:24:23.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jul 19 14:23:58 CEST 2006 - schwab@suse.de + +- Use the version from Gentoo. + +------------------------------------------------------------------- Old: ---- Makefile.module libmol.tar.bz2 mol-0.9.70.tgz mol.copy.kmod.sh New: ---- mol-0.9.71_pre8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mol.spec ++++++ --- /var/tmp/diff_new_pack.Ys4kFZ/_old 2006-07-19 19:20:12.000000000 +0200 +++ /var/tmp/diff_new_pack.Ys4kFZ/_new 2006-07-19 19:20:12.000000000 +0200 @@ -1,28 +1,24 @@ # -# spec file for package mol (Version 0.9.70) +# spec file for package mol (Version 0.9.71_pre8) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: mol -BuildRequires: alsa-devel gcc-c++ libelf libpng-devel xorg-x11-devel +BuildRequires: alsa-devel libpng-devel xorg-x11-devel Summary: Mac on Linux -Version: 0.9.70 -Release: 6 +Version: 0.9.71_pre8 +Release: 1 License: GPL Group: System/Emulators/Other -Source0: http://www.maconlinux.org/downloads/mol-%{version}.tgz -Source42: libmol.tar.bz2 +Source0: http://dev.gentoo.org/~josejx/mol-%{version}.tar.bz2 Url: http://www.maconlinux.org/ -Source1: Makefile.module -Source2: mol.copy.kmod.sh -Source3: mol_excludes.txt Patch0: mol.make-verbose.patch Patch1: mol.current_menu.patch Patch2: mol.insmod.patch @@ -33,9 +29,9 @@ %description Mac-On-Linux lets you run MacOS under LinuxPPC on PowerPC based -machines. Since it runs natively on the processor, it is very fast. +machines. Because it runs natively on the processor, it is very fast. Unlike most Mac emulators, Mac-on-Linux runs MacOS 8.6 and later -WITHOUT A ROM IMAGE*. To run earlier versions, a ROM-image is probably +WITHOUT A ROM IMAGE*. To run earlier versions, a ROM image is probably needed. @@ -52,36 +48,21 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 -exit 0 -tar xfj %{S:42} -cp -av libmol/* mollib %build CFLAGS="$RPM_OPT_FLAGS -U_FORTIFY_SOURCE -Wall -D_FILE_OFFSET_BITS=64" \ -mol_docdir=%{_defaultdocdir}/%{name} \ STRIP=true \ - ./configure \ - --mandir=%{_mandir} \ - --prefix=/usr \ - --enable-oldworld \ - --enable-fhs +./configure yes '' | make MAKE=make config -make MAKE=make BUILD_MODS=n prefix=/usr docdir=%{_defaultdocdir}/%{name} all #local +make MAKE=make BUILD_MODS=n prefix=/usr docdir=%{_docdir}/%{name} %install -rm -rf $RPM_BUILD_ROOT -make MAKE=make install prefix=/usr docdir=%{_defaultdocdir}/%{name} DESTDIR=$RPM_BUILD_ROOT +make MAKE=make install prefix=/usr docdir=%{_docdir}/%{name} DESTDIR=$RPM_BUILD_ROOT chmod 755 $RPM_BUILD_ROOT/usr/lib/mol/*/bin/mol -# ugly... -mkdir Doc_mol -mv -v $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/* Doc_mol - -%preun -rm -vf /usr/lib/mol/modules/System.map.last %files %defattr (-,root,root) -%doc Doc_mol/* +%{_docdir}/%{name} %attr(755,root,root) %dir /etc/mol %attr(755,root,root) %config (noreplace) /etc/mol/* /usr/bin/* @@ -91,6 +72,8 @@ %{_mandir}/man?/* %changelog -n mol +* Wed Jul 19 2006 - schwab@suse.de +- Use the version from Gentoo. * Wed Jan 25 2006 - mls@suse.de - converted neededforbuild to BuildRequires * Thu Jan 12 2006 - schwab@suse.de ++++++ mol.current_menu.patch ++++++ --- /var/tmp/diff_new_pack.Ys4kFZ/_old 2006-07-19 19:20:12.000000000 +0200 +++ /var/tmp/diff_new_pack.Ys4kFZ/_new 2006-07-19 19:20:12.000000000 +0200 @@ -1,16 +1,44 @@ - config/kconfig/mconf.c | 2 +- - 1 files changed, 1 insertion(+), 1 deletion(-) + config/kconfig/lkc.h | 3 --- + config/kconfig/menu.c | 1 - + config/kconfig/zconf-y.y | 2 ++ + 3 files changed, 2 insertions(+), 4 deletions(-) -Index: mol-0.9.70/config/kconfig/mconf.c +Index: mol-0.9.71_pre8/config/kconfig/lkc.h =================================================================== ---- mol-0.9.70.orig/config/kconfig/mconf.c -+++ mol-0.9.70/config/kconfig/mconf.c -@@ -88,7 +88,7 @@ static char *args[1024], **argptr = args - static int indent; - static struct termios ios_org; - static int rows, cols; --static struct menu *current_menu; -+struct menu *current_menu; - static int child_count; - static int do_resize; - static int single_menu_mode; +--- mol-0.9.71_pre8.orig/config/kconfig/lkc.h 2005-01-18 00:07:06.000000000 +0100 ++++ mol-0.9.71_pre8/config/kconfig/lkc.h 2006-06-04 03:09:36.000000000 +0200 +@@ -59,9 +59,6 @@ void menu_set_type(int type); + struct file *file_lookup(const char *name); + int file_write_dep(const char *name); + +-extern struct menu *current_entry; +-extern struct menu *current_menu; +- + /* symbol.c */ + void sym_init(void); + void sym_clear_all_valid(void); +Index: mol-0.9.71_pre8/config/kconfig/menu.c +=================================================================== +--- mol-0.9.71_pre8.orig/config/kconfig/menu.c 2005-01-18 00:07:06.000000000 +0100 ++++ mol-0.9.71_pre8/config/kconfig/menu.c 2006-06-04 03:09:50.000000000 +0200 +@@ -10,7 +10,6 @@ + #include "lkc.h" + + struct menu rootmenu; +-struct menu *current_menu, *current_entry; + static struct menu **last_entry_ptr; + + struct file *file_list; +Index: mol-0.9.71_pre8/config/kconfig/zconf-y.y +=================================================================== +--- mol-0.9.71_pre8.orig/config/kconfig/zconf-y.y 2005-01-18 00:07:06.000000000 +0100 ++++ mol-0.9.71_pre8/config/kconfig/zconf-y.y 2006-06-04 03:10:20.000000000 +0200 +@@ -25,6 +25,8 @@ static bool zconf_endtoken(int token, in + + struct symbol *symbol_hash[257]; + ++static struct menu *current_menu, *current_entry; ++ + #define YYERROR_VERBOSE + %} + %expect 40 ++++++ mol.make-verbose.patch ++++++ --- /var/tmp/diff_new_pack.Ys4kFZ/_old 2006-07-19 19:20:12.000000000 +0200 +++ /var/tmp/diff_new_pack.Ys4kFZ/_new 2006-07-19 19:20:12.000000000 +0200 @@ -1,30 +1,38 @@ - Makefile | 13 ++++++------- - 1 files changed, 6 insertions(+), 7 deletions(-) + Makefile | 1 - + config/Makefile.master | 6 +++--- + 2 files changed, 3 insertions(+), 4 deletions(-) -Index: mol-0.9.70/Makefile +Index: mol-0.9.71_pre8/Makefile =================================================================== ---- mol-0.9.70.orig/Makefile -+++ mol-0.9.70/Makefile -@@ -21,11 +21,11 @@ all-local: $(ARCHINCLUDES) $(AUTOFILES) +--- mol-0.9.71_pre8.orig/Makefile 2005-01-18 00:07:07.000000000 +0100 ++++ mol-0.9.71_pre8/Makefile 2006-06-04 03:26:48.000000000 +0200 +@@ -8,7 +8,6 @@ include config/Makefile.top + include config/Makefile.master - .PHONY: config - config: + SUBDIRS = . scripts src +-MAKE += -s + + $(OINC)/cpu: $(OINC)/.dir + @rm -f $@ +Index: mol-0.9.71_pre8/config/Makefile.master +=================================================================== +--- mol-0.9.71_pre8.orig/config/Makefile.master 2005-01-18 00:07:06.000000000 +0100 ++++ mol-0.9.71_pre8/config/Makefile.master 2006-06-04 03:29:01.000000000 +0200 +@@ -49,14 +49,14 @@ AUTOCONFFILE := $(ACONF)/autoconf.h + CONFIGURED := $(shell test -f .config-$(ARCH) && test -f $(AUTOCONFFILE) \ + > /dev/null 2>&1 && echo y ) + config: config-bootstrap - @$(MAKE) -s -C config $@ + @$(MAKE) -C config $@ - %config: + %config: config-bootstrap - @$(MAKE) -s -C config $@ + @$(MAKE) -C config $@ - bootstrap: -- @$(MAKE) -s -C config menuconfig ; \ -+ @$(MAKE) -C config menuconfig ; \ - test -f .config && $(MAKE) all - - $(AUTOFILES) : % : %.in configure.in -@@ -94,7 +94,6 @@ maintainerclean-local: - ##################################################################### - - SUBDIRS = . scripts src --MAKE += -s - ##################################################################### + do-config-bootstrap: $(ACONF)/molstamp + @true + do-bootstrap: do-config-bootstrap +- @$(MAKE) -s -C config menuconfig ++ @$(MAKE) -C config menuconfig + auto-bootstrap: do-bootstrap + @test -f .config-$(ARCH) && test -f $(AUTOCONFFILE) || exit 0 ; $(MAKE) all ++++++ mol.tap.patch ++++++ --- /var/tmp/diff_new_pack.Ys4kFZ/_old 2006-07-19 19:20:13.000000000 +0200 +++ /var/tmp/diff_new_pack.Ys4kFZ/_new 2006-07-19 19:20:13.000000000 +0200 @@ -1,127 +1,29 @@ - src/drivers/net/iface.c | 78 +----------------------------------------------- - 1 files changed, 2 insertions(+), 76 deletions(-) + src/drivers/net/Makefile | 2 +- + src/drivers/net/iface.c | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) -Index: mol-0.9.70/src/drivers/net/iface.c +Index: mol-0.9.71_pre8/src/drivers/net/iface.c =================================================================== ---- mol-0.9.70.orig/src/drivers/net/iface.c -+++ mol-0.9.70/src/drivers/net/iface.c -@@ -44,7 +44,7 @@ static char sheep_virtual_hw_addr[6] = { - - #define TUNSETUP_RES "tunconfig" - --enum{ f_tap=1, f_sheep=2, f_tun=4, f_driver_id_mask=7 }; -+enum{ f_sheep=2, f_tun=4, f_driver_id_mask=7 }; - - - /************************************************************************/ -@@ -186,73 +186,6 @@ static packet_driver_t sheep_pd = { - - - /************************************************************************/ --/* TAP Packet Driver */ --/************************************************************************/ -- --static int --tap_open( enet_iface_t *is, char *intf_name ) --{ -- struct sockaddr_nl nladdr; -- int fd, tapnum=0; -- char buf[16]; -- -- if( intf_name ) { -- if( sscanf(intf_name, "tap%d", &tapnum)==1 ) { -- if( tapnum<0 || tapnum>15 ) { -- printf("Invalid tap device %s. Using tap0 instead\n", intf_name ); -- intf_name = NULL; -- tapnum = 0; -- } -- } else { -- printm("Bad tapdevice interface '%s'\n", intf_name ); -- printm("Using default tap device (tap0)\n"); -- intf_name = NULL; -- } -- } -- if( !intf_name ) { -- sprintf( buf, "tap0" ); -- intf_name = buf; -- } -- -- /* verify that the device is up and running */ -- if( check_netdev( intf_name ) ) -- return 1; -- -- if( (fd = socket( PF_NETLINK, SOCK_RAW, NETLINK_TAPBASE+tapnum )) < 0 ) { -- perrorm("socket"); -- printm("Does the kernel lack netlink support (CONFIG_NETLINK)?\n"); -- return 1; -- } -- memset( &nladdr, 0, sizeof(nladdr) ); -- nladdr.nl_family = AF_NETLINK; -- nladdr.nl_groups = ~0; -- nladdr.nl_pid = TAP_VIRTUAL_HW_ADDR; -- /* nladdr.nl_pid = getpid(); */ -- if( bind( fd, (struct sockaddr*)&nladdr, sizeof(nladdr) ) < 0 ) { -- perrorm("bind"); -- close(fd); -- return 1; -- } -- -- is->eth_addr[0] = is->eth_addr[1] = 0; -- *(ulong*)&is->eth_addr[2] = TAP_VIRTUAL_HW_ADDR; -- /* *(ulong*)&is->eth_addr[2] = getpid(); */ -- -- is->packet_pad = TAP_PACKET_PAD; -- -- common_iface_open( is, "tap", intf_name, fd ); -- return 0; --} -- --static packet_driver_t tap_pd = { -- name: "tap", -- packet_driver_id: f_tap, -- open: tap_open, -- close: generic_close, --}; -- -- --/************************************************************************/ - /* TUN/TAP Packet Driver */ - /************************************************************************/ - -@@ -267,7 +200,7 @@ tun_open( enet_iface_t *is, char *intf_n - if( !intf_name ) - intf_name = "mol"; - -- /* allocate tun/tap device */ -+ /* allocate tun device */ - if( (fd=open("/dev/net/tun", O_RDWR | O_NONBLOCK)) < 0 ) { - perrorm("Failed to open /dev/net/tun"); - return 1; -@@ -330,7 +263,6 @@ static packet_driver_t *packet_drivers[] - &tun_pd, - #endif - &sheep_pd, -- &tap_pd, - NULL - }; - -@@ -338,7 +270,6 @@ static opt_entry_t netdev_opts[] = { - #ifdef HAS_TUN - {"-tun", f_tun }, +--- mol-0.9.71_pre8.orig/src/drivers/net/iface.c 2005-01-18 00:07:06.000000000 +0100 ++++ mol-0.9.71_pre8/src/drivers/net/iface.c 2006-06-04 03:11:28.000000000 +0200 +@@ -80,7 +80,6 @@ initialize_drivers( void ) + { + #ifdef __linux__ + init_tun(); +- init_tap(); + init_sheep(); #endif -- {"-tap", f_tap }, - {"-sheep", f_sheep }, - {NULL, 0 } - }; -@@ -355,11 +286,6 @@ find_packet_driver( char *res_name, int - - flags = parse_res_options( res_name, index, 1, netdev_opts, "---> Invalid netdev flag"); - -- if( str[0] != 't' ) -- flags &= ~f_tap; -- if( !(flags & (f_sheep | f_tap | f_tun)) ) -- flags |= (str[0] == 't')? f_tap : f_sheep; -- - for( pd=&packet_drivers[0]; *pd; pd++ ) - if( (**pd).packet_driver_id == (flags & f_driver_id_mask) ) - break; + #ifdef __darwin__ +Index: mol-0.9.71_pre8/src/drivers/net/Makefile +=================================================================== +--- mol-0.9.71_pre8.orig/src/drivers/net/Makefile 2005-01-18 00:07:06.000000000 +0100 ++++ mol-0.9.71_pre8/src/drivers/net/Makefile 2006-06-04 03:11:47.000000000 +0200 +@@ -5,7 +5,7 @@ XTARGETS = net + net-OBJS = $(obj-y) + + obj-$(OSX) += if-tun-darwin.o +-obj-$(LINUX) += if-tun.o if-sheep.o if-tap.o ++obj-$(LINUX) += if-tun.o if-sheep.o + obj-y += iface.o mac_enet.o enet2.o packet.o + obj-$(PPC) += ipchksum-ppc.o + obj-$(X86) += ipchksum-x86.o ++++++ mol.type-punned.patch ++++++ --- /var/tmp/diff_new_pack.Ys4kFZ/_old 2006-07-19 19:20:13.000000000 +0200 +++ /var/tmp/diff_new_pack.Ys4kFZ/_new 2006-07-19 19:20:13.000000000 +0200 @@ -13,11 +13,11 @@ src/main/promif.c | 4 +++- 4 files changed, 28 insertions(+), 9 deletions(-) -Index: mol-0.9.70/src/main/promif.c +Index: mol-0.9.71_pre8/src/main/promif.c =================================================================== ---- mol-0.9.70.orig/src/main/promif.c -+++ mol-0.9.70/src/main/promif.c -@@ -934,6 +934,7 @@ build_node( char *buf ) +--- mol-0.9.71_pre8.orig/src/main/promif.c 2005-10-10 03:22:50.000000000 +0200 ++++ mol-0.9.71_pre8/src/main/promif.c 2006-06-04 03:12:19.000000000 +0200 +@@ -940,6 +940,7 @@ build_node( char *buf ) p_property_t **prop_ptr; mol_device_node_t *dn; char *start, *end; @@ -25,7 +25,7 @@ dn = obstack_alloc( &oftree.stack, sizeof(mol_device_node_t) ); memset( dn, 0, sizeof(mol_device_node_t) ); -@@ -947,7 +948,8 @@ build_node( char *buf ) +@@ -953,7 +954,8 @@ build_node( char *buf ) /* phandle field -- used internally by MOL as node identifier */ if( findkey( buf, "mol_phandle", &start, NULL )) { @@ -35,10 +35,10 @@ if( (ulong)dn->node < PHANDLE_BASE ) { printm("-----> molrc: mol_phandle field 0x%lX < 0x%x\n", (ulong)dn->node, PHANDLE_BASE ); -Index: mol-0.9.70/src/drivers/disk/ablk.c +Index: mol-0.9.71_pre8/src/drivers/disk/ablk.c =================================================================== ---- mol-0.9.70.orig/src/drivers/disk/ablk.c -+++ mol-0.9.70/src/drivers/disk/ablk.c +--- mol-0.9.71_pre8.orig/src/drivers/disk/ablk.c 2005-10-10 03:22:48.000000000 +0200 ++++ mol-0.9.71_pre8/src/drivers/disk/ablk.c 2006-06-04 03:12:19.000000000 +0200 @@ -113,6 +113,7 @@ static void do_work( void ) { @@ -57,10 +57,10 @@ printm("ablk: bogus sg-buf"); goto error; } -Index: mol-0.9.70/src/drivers/usb.c +Index: mol-0.9.71_pre8/src/drivers/usb.c =================================================================== ---- mol-0.9.70.orig/src/drivers/usb.c -+++ mol-0.9.70/src/drivers/usb.c +--- mol-0.9.71_pre8.orig/src/drivers/usb.c 2005-01-18 00:07:06.000000000 +0100 ++++ mol-0.9.71_pre8/src/drivers/usb.c 2006-06-04 03:12:19.000000000 +0200 @@ -456,6 +456,12 @@ get_list_head( int list_type ) return mphys; } @@ -92,11 +92,11 @@ if( !(_ed=transl_mphys(mphys)) ) break; -Index: mol-0.9.70/src/drivers/dbdma.c +Index: mol-0.9.71_pre8/src/drivers/dbdma.c =================================================================== ---- mol-0.9.70.orig/src/drivers/dbdma.c -+++ mol-0.9.70/src/drivers/dbdma.c -@@ -228,6 +228,13 @@ dump_registers( int irq ) +--- mol-0.9.71_pre8.orig/src/drivers/dbdma.c 2006-06-04 03:12:11.000000000 +0200 ++++ mol-0.9.71_pre8/src/drivers/dbdma.c 2006-06-04 03:12:19.000000000 +0200 +@@ -229,6 +229,13 @@ dump_registers( int irq ) ld_le32(&ch->reg[r_br_sel]), ld_le32( &ch->reg[r_wait_sel] )); } @@ -110,7 +110,7 @@ static void dump_dbdma_cmd( ulong mphys ) { -@@ -247,8 +254,8 @@ dump_dbdma_cmd( ulong mphys ) +@@ -248,8 +255,8 @@ dump_dbdma_cmd( ulong mphys ) printm("I:%02X BR:%02X W:%02X\n", (cmd & 0x30)>>4, (cmd&0xc)>>2, (cmd&0x3) ); printm("req_count: %04X phy_addr: %08X cmd_dep: %08X\n", @@ -121,7 +121,7 @@ printm("res_count: %04X xfer_status: %04X\n", ld_le16( &cp->res_count ), ld_le16( &cp->xfer_status )); } -@@ -436,11 +443,13 @@ prepare_cmd( struct dbdma_channel *ch ) +@@ -437,11 +444,13 @@ prepare_cmd( struct dbdma_channel *ch ) { ulong cp_phys; int s; @@ -136,7 +136,7 @@ ch->cur_cmd_in_rom = 0; if( s<0 ) { -@@ -521,7 +530,7 @@ start_cmd( struct dbdma_channel *ch ) +@@ -522,7 +531,7 @@ start_cmd( struct dbdma_channel *ch ) ch->may_branch = 1; req_count = ld_le16( &cp->req_count ); @@ -145,7 +145,7 @@ if( key == 0x400 ) { printm("DBDMA: Reserved KEY 0x400\n"); -@@ -546,7 +555,7 @@ start_cmd( struct dbdma_channel *ch ) +@@ -547,7 +556,7 @@ start_cmd( struct dbdma_channel *ch ) VPRINT("DBDMA [%d]: Illegal key type %d\n", ch->irq, key ); key = KEY_SYSTEM; } ++++++ mol.uninitalized.patch ++++++ --- /var/tmp/diff_new_pack.Ys4kFZ/_old 2006-07-19 19:20:13.000000000 +0200 +++ /var/tmp/diff_new_pack.Ys4kFZ/_new 2006-07-19 19:20:13.000000000 +0200 @@ -1,11 +1,11 @@ src/drivers/dbdma.c | 1 + - 1 files changed, 1 insertion(+) + 1 file changed, 1 insertion(+) -Index: mol-0.9.70/src/drivers/dbdma.c +Index: mol-0.9.71_pre8/src/drivers/dbdma.c =================================================================== ---- mol-0.9.70.orig/src/drivers/dbdma.c -+++ mol-0.9.70/src/drivers/dbdma.c -@@ -1035,6 +1035,7 @@ dma_wait( int irq, int flags, struct tim +--- mol-0.9.71_pre8.orig/src/drivers/dbdma.c 2005-01-18 00:07:06.000000000 +0100 ++++ mol-0.9.71_pre8/src/drivers/dbdma.c 2006-06-04 03:12:11.000000000 +0200 +@@ -1036,6 +1036,7 @@ dma_wait( int irq, int flags, struct tim if( cond ){ ret.next = *ret_chain; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org