| Andreas Monzner on Fri, 4 Feb 2005 19:04:43 +0100 (CET) |
[Date Prev] [Date Next] [Thread Prev] [Thread Next] [Date Index] [Thread Index]
| cdk/Patches binutils.diff busybox.config busybox.diff default_lc.esml.diff etherwake.diff ftpd.diff gcc-core.diff gcc-g++.diff gcc-ibmppc4xx_fp_perflib.diff gdb-6.3-5.diff glibc-ibmppc4xx_fp_perflib.diff glibc_ppc4xx_ibmstropt.diff libpng.diff libungif.diff linux-dbox2-2.4.19.config linux-dbox2.config linux-libc-headers.diff ltrace.diff reiserfsprogs_add_credits.diff samba_ppc.diff scummvm.diff sdl.diff strace.diff util-linux.diff zlib.diff |
ghostrider 05/02/04 19:04:43
Modified: Patches Tag: dreambox binutils.diff busybox.config
busybox.diff ftpd.diff gcc-core.diff libpng.diff
ltrace.diff scummvm.diff sdl.diff zlib.diff
Added: Patches Tag: dreambox default_lc.esml.diff etherwake.diff
gcc-g++.diff gcc-ibmppc4xx_fp_perflib.diff
gdb-6.3-5.diff glibc-ibmppc4xx_fp_perflib.diff
glibc_ppc4xx_ibmstropt.diff libungif.diff
linux-libc-headers.diff
reiserfsprogs_add_credits.diff samba_ppc.diff
util-linux.diff
Removed: Patches Tag: dreambox linux-dbox2-2.4.19.config
linux-dbox2.config strace.diff
Log:
new dreambox cdk part 3 ( final part )
To build a complete Image for any dreambox do following:
1.) create a lokal directory for your new dreambox cdk and change into this new directory
2.) check out tuxbox-cvs branch "dreambox":
export CVS_RSH=ssh
cvs -d anoncvs@cvs.tuxbox.org:/cvs/tuxbox -z3 co -P -rdreambox .
3.) change into "cdk" directory
4.) "chmod ugo+x prepare"
5.) "./prepare <dm7000, dm500, dm56x0> ( dm7000 is default )
6.) "make checkout" ( this updates many parts of the CVS to HEAD branch )
7.) "make dreamboximage_root"
8.) "make rebuild-flash"
9.) "make flash-compress"
you now find the new image in "../root/cdkflash" named "complete.img"
in root/cdkflash/ you can delete .part_? files to remove parts from the image.. or you can add other parts to image with make flash-?... to see what parts exist you can look into Makefile.am
in dm56x0 and dm500 image many space is left for add other things.. for dm7000 you must remove parts before you add other parts..
max size of cramfs (kernel+bild) is 1152K ( 1179648 bytes )
max size of squashfs is 4992K (5111808)
complete this is 6144K (6291456)
to remove sambaserver you only must remove .part_sambaserver in root/cdkflash.. to remove reiserfsck remove .part_reiserfsck
when you will add "other plugins, programs, files" to your Image you can copy your parts to root/cdkflash/dreamfiles/? (bin/sbin) .. then do make rebuild-flash and make flash-compress but take not that root/cdkflash/dreamfiles will be deleted when new version of dreamdrivers.. or dreamfiles are available..
the other way to add own files to your image is to put your files after flashing the image into the box to /var .. at this place you have 1.7MB.. for most things this is enough..
to remove partially languages edit Makefile.am in part "flash-enigma":
when you like to remove russian language from you image then change the followinmg for loop :
@for i in ar sr ur ; do rm -R $(flashprefix)/root/share/locale/$$i; done
into
@for i in ar sr ur it ; do rm -R $(flashprefix)/root/share/locale/$$i; done
the cdk downloads automatically all dreambox specific parts from sources.dreamboxupdate.com ( drivers.. closed source tools.. )
Revision Changes Path
No revision
No revision
1.1.4.1 +12 -26 cdk/Patches/binutils.diff
file : http://cvs.tuxbox.org/tuxbox/cdk/Patches/binutils.diff?rev=1.1.4.1&content-type=text/vnd.viewcvs-markup
plain: http://cvs.tuxbox.org/tuxbox/cdk/Patches/binutils.diff?rev=1.1.4.1&content-type=text/plain
revision graph: http://cvs.tuxbox.org/tuxbox/cdk/Patches/binutils.diff?graph=1.1.4.1
diff : http://cvs.tuxbox.org/tuxbox/cdk/Patches/binutils.diff.diff?r1=1.1&r2=1.1.4.1
Index: binutils.diff
===================================================================
RCS file: /cvs/tuxbox/cdk/Patches/binutils.diff,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- binutils.diff 13 Oct 2002 02:29:43 -0000 1.1
+++ binutils.diff 4 Feb 2005 18:04:41 -0000 1.1.4.1
@@ -1,26 +1,12 @@
-diff -u -r --new-file --show-function-line=^[A-Za-z_] /sourceware/snapshot-tmp/binutils-snapshot/snap/old/binutils-021010/ld/ldgram.y ./ld/ldgram.y
---- /sourceware/snapshot-tmp/binutils-snapshot/snap/old/binutils-021010/ld/ldgram.y Tue May 7 04:04:54 2002
-+++ ./ld/ldgram.y Fri Oct 11 00:39:07 2002
-@@ -626,11 +626,11 @@ memory_spec_list:
- ;
-
-
--memory_spec: NAME
-- { region = lang_memory_region_lookup($1); }
-+memory_spec: NAME
-+ { region = lang_memory_region_lookup($1); }
- attributes_opt ':'
- origin_spec opt_comma length_spec
--
-+ {}
- ;
-
- origin_spec:
-@@ -845,6 +845,7 @@ section: NAME { ldlex_expression(); }
- lang_leave_output_section_statement ($14, $11, $13, $12);
- }
- opt_comma
-+ {}
- | OVERLAY
- { ldlex_expression (); }
- opt_exp_without_type opt_nocrossrefs opt_at
+diff -r -u binutils-2.13.90.0.18.old/ld/ldlex.l binutils-2.13.90.0.18/ld/ldlex.l
+--- binutils-2.13.90.0.18.old/ld/ldlex.l 2002-11-09 20:08:31.000000000 +0100
++++ binutils-2.13.90.0.18/ld/ldlex.l 2003-04-13 16:25:44.000000000 +0200
+@@ -611,7 +611,7 @@
+ int max_size;
+ {
+ *result = 0;
+- if (yy_current_buffer->yy_input_file)
++ if (YY_CURRENT_BUFFER->yy_input_file)
+ {
+ if (yyin)
+ {
1.10.2.2.2.1 +62 -52 cdk/Patches/busybox.config
file : http://cvs.tuxbox.org/tuxbox/cdk/Patches/busybox.config?rev=1.10.2.2.2.1&content-type=text/vnd.viewcvs-markup
plain: http://cvs.tuxbox.org/tuxbox/cdk/Patches/busybox.config?rev=1.10.2.2.2.1&content-type=text/plain
revision graph: http://cvs.tuxbox.org/tuxbox/cdk/Patches/busybox.config?graph=1.10.2.2.2.1
diff : http://cvs.tuxbox.org/tuxbox/cdk/Patches/busybox.config.diff?r1=1.10.2.2&r2=1.10.2.2.2.1
Index: busybox.config
===================================================================
RCS file: /cvs/tuxbox/cdk/Patches/busybox.config,v
retrieving revision 1.10.2.2
retrieving revision 1.10.2.2.2.1
diff -u -r1.10.2.2 -r1.10.2.2.2.1
--- busybox.config 1 Mar 2004 13:48:52 -0000 1.10.2.2
+++ busybox.config 4 Feb 2005 18:04:41 -0000 1.10.2.2.2.1
@@ -15,23 +15,24 @@
CONFIG_FEATURE_DEVFS=y
CONFIG_FEATURE_DEVPTS=y
# CONFIG_FEATURE_CLEAN_UP is not set
-# CONFIG_FEATURE_SUID is not set
+CONFIG_FEATURE_SUID=y
+# CONFIG_FEATURE_SUID_CONFIG is not set
# CONFIG_SELINUX is not set
#
# Build Options
#
# CONFIG_STATIC is not set
-# CONFIG_LFS is not set
+CONFIG_LFS=y
# USING_CROSS_COMPILER is not set
EXTRA_CFLAGS_OPTIONS=""
-# CONFIG_AUTH_IN_VAR_ETC is not set
+CONFIG_AUTH_IN_VAR_ETC=y
#
# Installation Options
#
CONFIG_INSTALL_NO_USR=y
-PREFIX=""
+PREFIX="./_install"
#
# Archival Utilities
@@ -75,15 +76,15 @@
CONFIG_CHROOT=y
# CONFIG_CMP is not set
CONFIG_CP=y
-CONFIG_CUT=y
+# CONFIG_CUT is not set
CONFIG_DATE=y
CONFIG_FEATURE_DATE_ISOFMT=y
CONFIG_DD=y
CONFIG_DF=y
-CONFIG_DIRNAME=y
+# CONFIG_DIRNAME is not set
# CONFIG_DOS2UNIX is not set
CONFIG_DU=y
-# CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K is not set
+CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y
CONFIG_ECHO=y
# CONFIG_FEATURE_FANCY_ECHO is not set
CONFIG_ENV=y
@@ -101,7 +102,7 @@
CONFIG_LS=y
CONFIG_FEATURE_LS_FILETYPES=y
CONFIG_FEATURE_LS_FOLLOWLINKS=y
-# CONFIG_FEATURE_LS_RECURSIVE is not set
+CONFIG_FEATURE_LS_RECURSIVE=y
CONFIG_FEATURE_LS_SORTFILES=y
CONFIG_FEATURE_LS_TIMESTAMPS=y
CONFIG_FEATURE_LS_USERNAME=y
@@ -109,7 +110,7 @@
# CONFIG_MD5SUM is not set
CONFIG_MKDIR=y
# CONFIG_MKFIFO is not set
-# CONFIG_MKNOD is not set
+CONFIG_MKNOD=y
CONFIG_MV=y
# CONFIG_OD is not set
# CONFIG_PRINTF is not set
@@ -123,7 +124,7 @@
# CONFIG_FEATURE_FANCY_SLEEP is not set
CONFIG_SORT=y
# CONFIG_STTY is not set
-# CONFIG_SYNC is not set
+CONFIG_SYNC=y
CONFIG_TAIL=y
# CONFIG_FEATURE_FANCY_TAIL is not set
# CONFIG_TEE is not set
@@ -132,6 +133,7 @@
#
# test (forced enabled for use with shell)
#
+# CONFIG_FEATURE_TEST_64 is not set
CONFIG_TOUCH=y
# CONFIG_TR is not set
CONFIG_TRUE=y
@@ -142,7 +144,7 @@
# CONFIG_UUDECODE is not set
# CONFIG_UUENCODE is not set
# CONFIG_WATCH is not set
-# CONFIG_WC is not set
+CONFIG_WC=y
# CONFIG_WHO is not set
CONFIG_WHOAMI=y
CONFIG_YES=y
@@ -170,7 +172,7 @@
# CONFIG_DEALLOCVT is not set
# CONFIG_DUMPKMAP is not set
# CONFIG_LOADFONT is not set
-# CONFIG_LOADKMAP is not set
+CONFIG_LOADKMAP=y
# CONFIG_OPENVT is not set
CONFIG_RESET=y
# CONFIG_SETKEYCODES is not set
@@ -183,7 +185,7 @@
# CONFIG_READLINK is not set
# CONFIG_RUN_PARTS is not set
# CONFIG_START_STOP_DAEMON is not set
-# CONFIG_WHICH is not set
+CONFIG_WHICH=y
#
# Editors
@@ -232,7 +234,7 @@
# CONFIG_FEATURE_INIT_COREDUMPS is not set
# CONFIG_FEATURE_EXTRA_QUIET is not set
CONFIG_HALT=y
-# CONFIG_POWEROFF is not set
+CONFIG_POWEROFF=y
CONFIG_REBOOT=y
# CONFIG_MESG is not set
@@ -245,10 +247,11 @@
# CONFIG_ADDUSER is not set
# CONFIG_DELUSER is not set
# CONFIG_GETTY is not set
+# CONFIG_FEATURE_U_W_TMP is not set
CONFIG_LOGIN=y
# CONFIG_FEATURE_SECURETTY is not set
CONFIG_PASSWD=y
-# CONFIG_SU is not set
+CONFIG_SU=y
# CONFIG_SULOGIN is not set
# CONFIG_VLOCK is not set
@@ -266,7 +269,13 @@
# CONFIG_DC is not set
# CONFIG_DEVFSD is not set
# CONFIG_LAST is not set
-# CONFIG_HDPARM is not set
+CONFIG_HDPARM=y
+CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
+# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
+# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
+CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y
# CONFIG_MAKEDEVS is not set
# CONFIG_MT is not set
# CONFIG_RX is not set
@@ -277,39 +286,37 @@
#
# Linux Module Utilities
#
-# CONFIG_INSMOD is not set
-# CONFIG_LSMOD is not set
+CONFIG_INSMOD=y
+# CONFIG_FEATURE_2_4_MODULES is not set
+CONFIG_FEATURE_2_6_MODULES=y
+CONFIG_LSMOD=y
# CONFIG_MODPROBE is not set
-# CONFIG_RMMOD is not set
+CONFIG_RMMOD=y
+# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set
#
# Networking Utilities
#
-CONFIG_FEATURE_IPV6=y
+# CONFIG_FEATURE_IPV6 is not set
# CONFIG_ARPING is not set
# CONFIG_FTPGET is not set
# CONFIG_FTPPUT is not set
CONFIG_HOSTNAME=y
# CONFIG_HTTPD is not set
-# CONFIG_IFCONFIG is not set
-CONFIG_IFUPDOWN=y
-CONFIG_FEATURE_IFUPDOWN_IP=y
-CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y
-CONFIG_FEATURE_IFUPDOWN_IPV4=y
-CONFIG_FEATURE_IFUPDOWN_IPV6=y
-# CONFIG_FEATURE_IFUPDOWN_IPX is not set
-# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
+CONFIG_IFCONFIG=y
+CONFIG_FEATURE_IFCONFIG_STATUS=y
+# CONFIG_FEATURE_IFCONFIG_SLIP is not set
+# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set
+CONFIG_FEATURE_IFCONFIG_HW=y
+# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
+# CONFIG_IFUPDOWN is not set
CONFIG_INETD=y
# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_ECHO is not set
# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_DISCARD is not set
# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_TIME is not set
<<Truncated>>
1.8.2.2.2.1 +317 -34 cdk/Patches/busybox.diff
file : http://cvs.tuxbox.org/tuxbox/cdk/Patches/busybox.diff?rev=1.8.2.2.2.1&content-type=text/vnd.viewcvs-markup
plain: http://cvs.tuxbox.org/tuxbox/cdk/Patches/busybox.diff?rev=1.8.2.2.2.1&content-type=text/plain
revision graph: http://cvs.tuxbox.org/tuxbox/cdk/Patches/busybox.diff?graph=1.8.2.2.2.1
diff : http://cvs.tuxbox.org/tuxbox/cdk/Patches/busybox.diff.diff?r1=1.8.2.2&r2=1.8.2.2.2.1
Index: busybox.diff
===================================================================
RCS file: /cvs/tuxbox/cdk/Patches/busybox.diff,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.2.2.1
diff -u -r1.8.2.2 -r1.8.2.2.2.1
--- busybox.diff 1 Mar 2004 13:48:52 -0000 1.8.2.2
+++ busybox.diff 4 Feb 2005 18:04:41 -0000 1.8.2.2.2.1
@@ -1,7 +1,7 @@
-diff -Naur busybox-1.00-pre7/init/init.c busybox-1.00-pre7-dbox2/init/init.c
---- busybox-1.00-pre7/init/init.c 2003-09-26 12:45:55.000000000 +0200
-+++ busybox-1.00-pre7-dbox2/init/init.c 2004-02-22 16:13:00.000000000 +0100
-@@ -376,7 +376,7 @@
+diff -Naur busybox-1.00/init/init.c busybox-1.00-patched/init/init.c
+--- busybox-1.00/init/init.c 2004-10-08 10:21:54.000000000 +0200
++++ busybox-1.00-patched/init/init.c 2005-02-03 21:14:50.000000000 +0100
+@@ -374,7 +374,7 @@
while ((fd = open(console, O_RDONLY | O_NONBLOCK)) < 0 && tried < 2) {
/* Can't open selected console -- try
logical system console and VT_MASTER */
@@ -30,9 +30,9 @@
}
return wpid;
}
-diff -Naur busybox-1.00-pre7/libbb/messages.c busybox-1.00-pre7-dbox2/libbb/messages.c
---- busybox-1.00-pre7/libbb/messages.c 2003-09-02 04:36:11.000000000 +0200
-+++ busybox-1.00-pre7-dbox2/libbb/messages.c 2004-02-22 16:11:11.000000000 +0100
+diff -Naur busybox-1.00/libbb/messages.c busybox-1.00-patched/libbb/messages.c
+--- busybox-1.00/libbb/messages.c 2004-03-15 09:28:42.000000000 +0100
++++ busybox-1.00-patched/libbb/messages.c 2005-02-03 21:14:50.000000000 +0100
@@ -56,27 +56,47 @@
#endif
@@ -86,39 +86,322 @@
const char * const bb_path_nologin_file = NOLOGIN_FILE;
#endif
-diff -Naur busybox-1.00-pre7/networking/ifupdown.c busybox-1.00-pre7-dbox2/networking/ifupdown.c
---- busybox-1.00-pre7/networking/ifupdown.c 2003-12-19 11:46:00.000000000 +0100
-+++ busybox-1.00-pre7-dbox2/networking/ifupdown.c 2004-02-22 16:11:11.000000000 +0100
-@@ -1022,7 +1022,7 @@
-
- static int execute_all(struct interface_defn_t *ifd, execfn *exec, const char *opt)
+diff -Naur busybox-1.00/libbb/procps.c busybox-1.00-patched/libbb/procps.c
+--- busybox-1.00/libbb/procps.c 2004-08-27 00:18:58.000000000 +0200
++++ busybox-1.00-patched/libbb/procps.c 2005-02-03 21:17:13.000000000 +0100
+@@ -22,7 +22,7 @@
+ #endif
+ )
{
-- int i;
-+ int i, fd;
- char *buf;
- for (i = 0; i < ifd->n_options; i++) {
- if (strcmp(ifd->option[i].name, opt) == 0) {
-@@ -1031,9 +1031,13 @@
+- static DIR *dir;
++ static DIR *dir, *taskdir;
+ struct dirent *entry;
+ static procps_status_t ret_status;
+ char *name;
+@@ -32,6 +32,7 @@
+ FILE *fp;
+ procps_status_t curstatus;
+ int pid;
++ static int parentpid;
+ long tasknice;
+ struct stat sb;
+
+@@ -40,111 +41,149 @@
+ if(!dir)
+ bb_error_msg_and_die("Can't open /proc");
+ }
+- for(;;) {
+- if((entry = readdir(dir)) == NULL) {
+- closedir(dir);
+- dir = 0;
+- return 0;
+- }
+- name = entry->d_name;
+- if (!(*name >= '0' && *name <= '9'))
+- continue;
+
+- memset(&curstatus, 0, sizeof(procps_status_t));
+- pid = atoi(name);
+- curstatus.pid = pid;
++ if (taskdir) {
++ for(;;) {
++ if((entry = readdir(taskdir)) == NULL) {
++ closedir(taskdir);
++ taskdir = 0;
++ break;
++ }
++ name = entry->d_name;
++ if (!(*name >= '0' && *name <= '9'))
++ continue;
+
+- sprintf(status, "/proc/%d", pid);
+- if(stat(status, &sb))
+- continue;
+- my_getpwuid(curstatus.user, sb.st_uid, sizeof(curstatus.user));
++ memset(&curstatus, 0, sizeof(procps_status_t));
++ pid = atoi(name);
++ curstatus.pid = pid;
+
+- sprintf(status, "/proc/%d/stat", pid);
+- if((fp = fopen(status, "r")) == NULL)
+- continue;
+-#ifdef CONFIG_SELINUX
+- if(use_selinux)
+- {
+- if(fstat_secure(fileno(fp), &sb, sid))
++ sprintf(status, "/proc/%d/task/%d", parentpid, pid);
++ if(stat(status, &sb))
+ continue;
+- }
+- else
++ my_getpwuid(curstatus.user, sb.st_uid, sizeof(curstatus.user));
++
++ sprintf(status, "/proc/%d/task/%d/stat", parentpid, pid);
++ if((fp = fopen(status, "r")) == NULL)
++ continue;
++#ifdef CONFIG_SELINUX
++ if(use_selinux)
++ {
++ if(fstat_secure(fileno(fp), &sb, sid))
++ continue;
++ }
++ else
+ #endif
+- name = fgets(buf, sizeof(buf), fp);
+- fclose(fp);
+- if(name == NULL)
+- continue;
+- name = strrchr(buf, ')'); /* split into "PID (cmd" and "<rest>" */
+- if(name == 0 || name[1] != ' ')
+- continue;
+- *name = 0;
+- sscanf(buf, "%*s (%15c", curstatus.short_cmd);
+- n = sscanf(name+2,
+- "%c %d "
+- "%*s %*s %*s %*s " /* pgrp, session, tty, tpgid */
+- "%*s %*s %*s %*s %*s " /* flags, min_flt, cmin_flt, maj_flt, cmaj_flt */
++ name = fgets(buf, sizeof(buf), fp);
++ fclose(fp);
++ if(name == NULL)
++ continue;
++ name = strrchr(buf, ')'); /* split into "PID (cmd" and "<rest>" */
++ if(name == 0 || name[1] != ' ')
++ continue;
++ *name = 0;
++ sscanf(buf, "%*s (%15c", curstatus.short_cmd);
++ n = sscanf(name+2,
++ "%c %d "
++ "%*s %*s %*s %*s " /* pgrp, session, tty, tpgid */
++ "%*s %*s %*s %*s %*s " /* flags, min_flt, cmin_flt, maj_flt, cmaj_flt */
+ #ifdef FEATURE_CPU_USAGE_PERCENTAGE
+- "%lu %lu "
++ "%lu %lu "
+ #else
+- "%*s %*s "
++ "%*s %*s "
+ #endif
+- "%*s %*s %*s " /* cutime, cstime, priority */
+- "%ld "
+- "%*s %*s %*s " /* timeout, it_real_value, start_time */
+- "%*s " /* vsize */
+- "%ld",
+- curstatus.state, &curstatus.ppid,
++ "%*s %*s %*s " /* cutime, cstime, priority */
++ "%ld "
++ "%*s %*s %*s " /* timeout, it_real_value, start_time */
++ "%*s " /* vsize */
++ "%ld",
++ curstatus.state, &curstatus.ppid,
+ #ifdef FEATURE_CPU_USAGE_PERCENTAGE
+- &curstatus.utime, &curstatus.stime,
++ &curstatus.utime, &curstatus.stime,
+ #endif
+- &tasknice,
+- &curstatus.rss);
++ &tasknice,
++ &curstatus.rss);
++ if ( pid != parentpid )
++ curstatus.ppid = parentpid;
+ #ifdef FEATURE_CPU_USAGE_PERCENTAGE
+- if(n != 6)
++ if(n != 6)
+ #else
+- if(n != 4)
++ if(n != 4)
+ #endif
+- continue;
++ continue;
+
+- if (curstatus.rss == 0 && curstatus.state[0] != 'Z')
+- curstatus.state[1] = 'W';
+- else
+- curstatus.state[1] = ' ';
<<Truncated>>
1.1.4.1 +20 -22 cdk/Patches/ftpd.diff
file : http://cvs.tuxbox.org/tuxbox/cdk/Patches/ftpd.diff?rev=1.1.4.1&content-type=text/vnd.viewcvs-markup
plain: http://cvs.tuxbox.org/tuxbox/cdk/Patches/ftpd.diff?rev=1.1.4.1&content-type=text/plain
revision graph: http://cvs.tuxbox.org/tuxbox/cdk/Patches/ftpd.diff?graph=1.1.4.1
diff : http://cvs.tuxbox.org/tuxbox/cdk/Patches/ftpd.diff.diff?r1=1.1&r2=1.1.4.1
Index: ftpd.diff
===================================================================
RCS file: /cvs/tuxbox/cdk/Patches/ftpd.diff,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- ftpd.diff 1 Mar 2002 23:03:55 -0000 1.1
+++ ftpd.diff 4 Feb 2005 18:04:41 -0000 1.1.4.1
@@ -1,22 +1,5 @@
-diff -urN vsftpd-1.0.1.orig/Makefile vsftpd-1.0.1/Makefile
---- vsftpd-1.0.1.orig/Makefile Mon Oct 8 23:35:27 2001
-+++ vsftpd-1.0.1/Makefile Fri Mar 1 23:14:33 2002
-@@ -1,10 +1,9 @@
- # Makefile for systems with GNU tools
--CC = gcc
- INSTALL = install
- IFLAGS = -idirafter dummyinc
--CFLAGS = -O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion
-+CFLAGS = -Os -Wall -W
-
--LIBS = `./vsf_findlibs.sh`
-+LIBS = -lcrypt
- LINK = -Wl,-s
-
- OBJS = main.o utility.o prelogin.o ftpcmdio.o postlogin.o privsock.o \
-diff -urN vsftpd-1.0.1.orig/sysdeputil.c vsftpd-1.0.1/sysdeputil.c
---- vsftpd-1.0.1.orig/sysdeputil.c Tue Nov 13 22:12:54 2001
-+++ vsftpd-1.0.1/sysdeputil.c Fri Mar 1 23:01:53 2002
+--- vsftpd-1.1.0.orig/sysdeputil.c Tue Nov 13 22:12:54 2001
++++ vsftpd-1.1.0/sysdeputil.c Fri Mar 1 23:01:53 2002
@@ -39,10 +39,10 @@
#undef VSF_SYSDEP_HAVE_HPUX_SETPROCTITLE
#undef VSF_SYSDEP_HAVE_MAP_ANON
@@ -30,9 +13,8 @@
/* BEGIN config */
#if defined(__linux__) && !defined(__ia64__) && !defined(__s390__)
-diff -urN vsftpd-1.0.1.orig/vsftpd-dbox2.conf vsftpd-1.0.1/vsftpd-dbox2.conf
---- vsftpd-1.0.1.orig/vsftpd-dbox2.conf Thu Jan 1 01:00:00 1970
-+++ vsftpd-1.0.1/vsftpd-dbox2.conf Fri Mar 1 23:13:43 2002
+--- vsftpd-1.1.0.orig/vsftpd-dbox2.conf Thu Jan 1 01:00:00 1970
++++ vsftpd-1.1.0/vsftpd-dbox2.conf Fri Mar 1 23:13:43 2002
@@ -0,0 +1,12 @@
+# config file /etc/vsftpd.conf
+
@@ -46,3 +28,19 @@
+secure_chroot_dir=/share/empty
+ftpd_banner=Willkomen auf Ihrer d-box 2.
+
+--- vsftpd-1.1.0/Makefile.orig 2005-01-22 11:51:42.000000000 +0100
++++ vsftpd-1.1.0/Makefile 2005-01-22 11:53:43.000000000 +0100
+@@ -1,11 +1,10 @@
+ # Makefile for systems with GNU tools
+-CC = gcc
+ INSTALL = install
+ IFLAGS = -idirafter dummyinc
+ #CFLAGS = -g
+-CFLAGS = -O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion
++CFLAGS = -Os -Wall -W -D_FILE_OFFSET_BITS=64
+
+-LIBS = `./vsf_findlibs.sh`
++LIBS = -lcrypt
+ LINK = -Wl,-s
+
+ OBJS = main.o utility.o prelogin.o ftpcmdio.o postlogin.o privsock.o \
1.2.2.1.2.1 +15 -25 cdk/Patches/gcc-core.diff
file : http://cvs.tuxbox.org/tuxbox/cdk/Patches/gcc-core.diff?rev=1.2.2.1.2.1&content-type=text/vnd.viewcvs-markup
plain: http://cvs.tuxbox.org/tuxbox/cdk/Patches/gcc-core.diff?rev=1.2.2.1.2.1&content-type=text/plain
revision graph: http://cvs.tuxbox.org/tuxbox/cdk/Patches/gcc-core.diff?graph=1.2.2.1.2.1
diff : http://cvs.tuxbox.org/tuxbox/cdk/Patches/gcc-core.diff.diff?r1=1.2.2.1&r2=1.2.2.1.2.1
Index: gcc-core.diff
===================================================================
RCS file: /cvs/tuxbox/cdk/Patches/gcc-core.diff,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.1.2.1
diff -u -r1.2.2.1 -r1.2.2.1.2.1
--- gcc-core.diff 3 Mar 2003 17:05:53 -0000 1.2.2.1
+++ gcc-core.diff 4 Feb 2005 18:04:41 -0000 1.2.2.1.2.1
@@ -1,35 +1,25 @@
-diff -urN gcc-3.2.2.orig/gcc/config/rs6000/linux.h gcc-3.2.2/gcc/config/rs6000/linux.h
---- gcc-3.2.2.orig/gcc/config/rs6000/linux.h 2003-01-23 23:19:42.000000000 +0100
-+++ gcc-3.2.2/gcc/config/rs6000/linux.h 2003-02-08 14:53:52.000000000 +0100
-@@ -78,8 +78,11 @@
+diff -Naur gcc-3.4.2/gcc/config/rs6000/linux.h gcc-3.4.2-patched/gcc/config/rs6000/linux.h
+--- gcc-3.4.2/gcc/config/rs6000/linux.h 2004-02-25 16:11:19.000000000 +0100
++++ gcc-3.4.2-patched/gcc/config/rs6000/linux.h 2004-09-29 15:24:57.000000000 +0200
+@@ -97,7 +97,11 @@
state data appropriately. See unwind-dw2.c for the structs. */
#ifdef IN_LIBGCC2
-#include <signal.h>
--#include <sys/ucontext.h>
+#include <linux/types.h>
+#include <asm/sigcontext.h>
+#include <asm/siginfo.h>
+#include <asm/signal.h>
+#include <asm/ucontext.h>
- enum { SIGNAL_FRAMESIZE = 64 };
- #endif
-@@ -87,7 +90,7 @@
- #define MD_FALLBACK_FRAME_STATE_FOR(CONTEXT, FS, SUCCESS) \
- do { \
- unsigned char *pc_ = (CONTEXT)->ra; \
-- struct sigcontext *sc_; \
-+ struct sigcontext_struct *sc_; \
- long new_cfa_; \
- int i_; \
- \
-@@ -102,7 +105,7 @@
- { \
- struct sigframe { \
- char gap[SIGNAL_FRAMESIZE]; \
-- struct sigcontext sigctx; \
-+ struct sigcontext_struct sigctx; \
- } *rt_ = (CONTEXT)->cfa; \
- sc_ = &rt_->sigctx; \
- } \
+ /* During the 2.5 kernel series the kernel ucontext was changed, but
+ the new layout is compatible with the old one, so we just define
+@@ -107,7 +111,7 @@
+ unsigned long uc_flags;
+ struct ucontext *uc_link;
+ stack_t uc_stack;
+- struct sigcontext_struct uc_mcontext;
++ struct sigcontext uc_mcontext;
+ sigset_t uc_sigmask;
+ };
+
1.1.2.2.2.1 +2 -1 cdk/Patches/libpng.diff
file : http://cvs.tuxbox.org/tuxbox/cdk/Patches/libpng.diff?rev=1.1.2.2.2.1&content-type=text/vnd.viewcvs-markup
plain: http://cvs.tuxbox.org/tuxbox/cdk/Patches/libpng.diff?rev=1.1.2.2.2.1&content-type=text/plain
revision graph: http://cvs.tuxbox.org/tuxbox/cdk/Patches/libpng.diff?graph=1.1.2.2.2.1
diff : http://cvs.tuxbox.org/tuxbox/cdk/Patches/libpng.diff.diff?r1=1.1.2.2&r2=1.1.2.2.2.1
Index: libpng.diff
===================================================================
RCS file: /cvs/tuxbox/cdk/Patches/libpng.diff,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.2.2.1
diff -u -r1.1.2.2 -r1.1.2.2.2.1
--- libpng.diff 28 Oct 2003 07:57:46 -0000 1.1.2.2
+++ libpng.diff 4 Feb 2005 18:04:41 -0000 1.1.2.2.2.1
@@ -9,7 +9,7 @@
+
+LIBNAME = libpng12
+PNGMAJ = 0
-+PNGMIN = 1.2.5
++PNGMIN = 1.2.6
+PNGVER = $(PNGMAJ).$(PNGMIN)
+
+CC=powerpc-tuxbox-linux-gnu-gcc
@@ -214,3 +214,4 @@
+pngpread.o pngpread.pic.o: png.h pngconf.h
+
+pngtest.o: png.h pngconf.h
+
\ No newline at end of file
1.2.6.1 +18 -7 cdk/Patches/ltrace.diff
file : http://cvs.tuxbox.org/tuxbox/cdk/Patches/ltrace.diff?rev=1.2.6.1&content-type=text/vnd.viewcvs-markup
plain: http://cvs.tuxbox.org/tuxbox/cdk/Patches/ltrace.diff?rev=1.2.6.1&content-type=text/plain
revision graph: http://cvs.tuxbox.org/tuxbox/cdk/Patches/ltrace.diff?graph=1.2.6.1
diff : http://cvs.tuxbox.org/tuxbox/cdk/Patches/ltrace.diff.diff?r1=1.2&r2=1.2.6.1
Index: ltrace.diff
===================================================================
RCS file: /cvs/tuxbox/cdk/Patches/ltrace.diff,v
retrieving revision 1.2
retrieving revision 1.2.6.1
diff -u -r1.2 -r1.2.6.1
--- ltrace.diff 24 Aug 2002 12:17:38 -0000 1.2
+++ ltrace.diff 4 Feb 2005 18:04:41 -0000 1.2.6.1
@@ -1,7 +1,7 @@
-diff -Naur ltrace-0.3.26.orig/Makefile.in ltrace-0.3.26/Makefile.in
---- ltrace-0.3.26.orig/Makefile.in Sun Mar 3 22:00:43 2002
-+++ ltrace-0.3.26/Makefile.in Sat Aug 24 14:14:28 2002
-@@ -48,7 +48,7 @@
+diff -Naur ltrace-0.3.35.org/Makefile.in ltrace-0.3.35/Makefile.in
+--- ltrace-0.3.35.org/Makefile.in 2003-03-30 16:38:05.000000000 +0200
++++ ltrace-0.3.35/Makefile.in 2005-02-01 18:31:46.000000000 +0100
+@@ -49,7 +49,7 @@
install: ltrace
@INSTALL@ -d $(DESTDIR)$(bindir) $(DESTDIR)$(docdir) $(DESTDIR)$(mandir)/man1
@INSTALL@ -d $(DESTDIR)$(sysconfdir)
@@ -10,9 +10,20 @@
@INSTALL@ -m 644 etc/ltrace.conf $(DESTDIR)$(sysconfdir)
@INSTALL@ -m 644 COPYING README TODO BUGS ChangeLog $(DESTDIR)$(docdir)
@INSTALL@ -m 644 ltrace.1 $(DESTDIR)$(mandir)/man1
-diff -Naur ltrace-0.3.26.orig/sysdeps/linux-gnu/Makefile ltrace-0.3.26/sysdeps/linux-gnu/Makefile
---- ltrace-0.3.26.orig/sysdeps/linux-gnu/Makefile Sun Mar 3 02:18:47 2002
-+++ ltrace-0.3.26/sysdeps/linux-gnu/Makefile Sat Aug 24 14:13:56 2002
+diff -Naur ltrace-0.3.35.org/options.c ltrace-0.3.35/options.c
+--- ltrace-0.3.35.org/options.c 2004-06-14 17:17:52.000000000 +0200
++++ ltrace-0.3.35/options.c 2005-02-01 18:36:07.000000000 +0100
+@@ -12,6 +12,7 @@
+ #include <fcntl.h>
+ #include <errno.h>
+ #include <limits.h>
++#include <sys/param.h>
+
+ #if HAVE_GETOPT_H
+ #include <getopt.h>
+diff -Naur ltrace-0.3.35.org/sysdeps/linux-gnu/Makefile ltrace-0.3.35/sysdeps/linux-gnu/Makefile
+--- ltrace-0.3.35.org/sysdeps/linux-gnu/Makefile 2002-03-03 02:18:47.000000000 +0100
++++ ltrace-0.3.35/sysdeps/linux-gnu/Makefile 2005-02-01 18:31:46.000000000 +0100
@@ -1,4 +1,4 @@
-ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
+ARCH := ppc
1.3.4.1 +30 -19 cdk/Patches/Attic/scummvm.diff
file : http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/scummvm.diff?rev=1.3.4.1&content-type=text/vnd.viewcvs-markup
plain: http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/scummvm.diff?rev=1.3.4.1&content-type=text/plain
revision graph: http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/scummvm.diff?graph=1.3.4.1
diff : http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/scummvm.diff.diff?r1=1.3&r2=1.3.4.1
Index: scummvm.diff
===================================================================
RCS file: /cvs/tuxbox/cdk/Patches/Attic/scummvm.diff,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- scummvm.diff 9 Jun 2002 16:45:54 -0000 1.3
+++ scummvm.diff 4 Feb 2005 18:04:41 -0000 1.3.4.1
@@ -1,20 +1,31 @@
---- scummvm/sdl.cpp Tue Jun 4 20:18:43 2002
-+++ sdl.cpp Sun Jun 9 18:29:46 2002
-@@ -312,7 +312,7 @@
- uint16 *tmp_screen = (uint16*)calloc((SCREEN_WIDTH+3)*(SCREEN_HEIGHT+3),sizeof(uint16));
- _mode_flags = DF_WANT_RECT_OPTIM | DF_SEPARATE_TEMPSCREEN | DF_UPDATE_EXPAND_1_PIXEL;
+diff -Naur scummvm-0.6.0/backends/sdl/sdl.cpp scummvm-0.6.0-pached/backends/sdl/sdl.cpp
+--- scummvm-0.6.0/backends/sdl/sdl.cpp 2004-02-28 14:01:43.000000000 +0100
++++ scummvm-0.6.0/backends/sdl/sdl.cpp 2004-11-20 18:30:26.000000000 +0100
+@@ -127,9 +127,8 @@
+ // Create the surface that contains the scaled graphics in 16 bit mode
+ //
-- sdl_hwscreen = SDL_SetVideoMode(SCREEN_WIDTH * scaling, SCREEN_HEIGHT * scaling, 16,
-+ sdl_hwscreen = SDL_SetVideoMode(640, 480, 16,
- _full_screen ? (SDL_FULLSCREEN|SDL_SWSURFACE) : SDL_SWSURFACE
- );
- if (sdl_hwscreen == NULL)
-@@ -348,7 +348,7 @@
-
- _mode_flags = DF_WANT_RECT_OPTIM | DF_REAL_8BIT;
-
-- sdl_hwscreen = SDL_SetVideoMode(SCREEN_WIDTH * scaling, SCREEN_HEIGHT * scaling, 8,
-+ sdl_hwscreen = SDL_SetVideoMode(640, 480, 8,
- _full_screen ? (SDL_FULLSCREEN|SDL_SWSURFACE) : SDL_SWSURFACE
- );
- if (sdl_hwscreen == NULL)
+- _hwscreen = SDL_SetVideoMode(_screenWidth * _scaleFactor, (_adjustAspectRatio ? 240 : _screenHeight) * _scaleFactor, 16,
+- _full_screen ? (SDL_FULLSCREEN|SDL_SWSURFACE) : SDL_SWSURFACE
+- );
++ _hwscreen = SDL_SetVideoMode(720, 576, 16,
++ _full_screen ? (SDL_FULLSCREEN|SDL_SWSURFACE) : SDL_SWSURFACE);
+ if (_hwscreen == NULL) {
+ // DON'T use error(), as this tries to bring up the debug
+ // console, which WON'T WORK now that _hwscreen is hosed.
+diff -Naur scummvm-0.6.0/configure scummvm-0.6.0-pached/configure
+--- scummvm-0.6.0/configure 2004-02-15 01:42:36.000000000 +0100
++++ scummvm-0.6.0/configure 2004-11-20 17:29:01.000000000 +0100
+@@ -419,10 +419,10 @@
+ if test -n "$_host"; then
+ # Cross-compiling mode - add your target here if needed
+ case "$_host" in
+- arm-linux)
++ powerpc-tuxbox-linux-gnu)
+ echo "Cross-compiling to $_host, forcing endianness, alignment and type sizes"
+ DEFINES="$DEFINES -DUNIX"
+- _def_endianess='#define SCUMM_LITTLE_ENDIAN'
++ _def_endianess='#define SCUMM_BIG_ENDIAN'
+ _def_align='#define SCUMM_NEED_ALIGNMENT'
+ type_1_byte='char'
+ type_2_byte='short'
1.4.4.1 +53 -64 cdk/Patches/sdl.diff
file : http://cvs.tuxbox.org/tuxbox/cdk/Patches/sdl.diff?rev=1.4.4.1&content-type=text/vnd.viewcvs-markup
plain: http://cvs.tuxbox.org/tuxbox/cdk/Patches/sdl.diff?rev=1.4.4.1&content-type=text/plain
revision graph: http://cvs.tuxbox.org/tuxbox/cdk/Patches/sdl.diff?graph=1.4.4.1
diff : http://cvs.tuxbox.org/tuxbox/cdk/Patches/sdl.diff.diff?r1=1.4&r2=1.4.4.1
Index: sdl.diff
===================================================================
RCS file: /cvs/tuxbox/cdk/Patches/sdl.diff,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -r1.4 -r1.4.4.1
--- sdl.diff 25 Aug 2002 23:33:40 -0000 1.4
+++ sdl.diff 4 Feb 2005 18:04:41 -0000 1.4.4.1
@@ -1,5 +1,5 @@
---- Archive/SDL-1.2.4.orig/src/video/fbcon/SDL_fbevents.c 2002-03-06 12:23:03.000000000 +0100
-+++ SDL-1.2.4/src/video/fbcon/SDL_fbevents.c 2002-08-26 01:26:16.000000000 +0200
+--- Archive/SDL-1.2.6.orig/src/video/fbcon/SDL_fbevents.c 2002-03-06 12:23:03.000000000 +0100
++++ SDL-1.2.6/src/video/fbcon/SDL_fbevents.c 2002-08-26 01:26:16.000000000 +0200
@@ -69,6 +69,65 @@
static Uint16 keymap_temp[128]; /* only used at startup */
static SDL_keysym *TranslateKey(int scancode, SDL_keysym *keysym);
@@ -290,10 +290,56 @@
if ( mouse_fd >= 0 ) {
if ( FD_ISSET(mouse_fd, &fdset) ) {
handle_mouse(this);
-diff -Naur Archive/SDL-1.2.4.orig/src/video/fbcon/SDL_fbvideo.c SDL-1.2.4/src/video/fbcon/SDL_fbvideo.c
---- Archive/SDL-1.2.4.orig/src/video/fbcon/SDL_fbvideo.c 2002-04-03 23:45:25.000000000 +0200
-+++ SDL-1.2.4/src/video/fbcon/SDL_fbvideo.c 2002-08-19 05:25:32.000000000 +0200
-@@ -161,7 +161,7 @@
+diff -Naur Archive/SDL-1.2.6.orig/src/video/fbcon/SDL_fbvideo.h SDL-1.2.6/src/video/fbcon/SDL_fbvideo.h
+--- Archive/SDL-1.2.6.orig/src/video/fbcon/SDL_fbvideo.h 2002-03-06 12:23:04.000000000 +0100
++++ SDL-1.2.6/src/video/fbcon/SDL_fbvideo.h 2002-08-19 05:25:36.000000000 +0200
+@@ -61,6 +61,7 @@
+ int current_vt;
+ int saved_vt;
+ int keyboard_fd;
++ int rc_fd;
+ int saved_kbd_mode;
+ struct termios saved_kbd_termios;
+
+@@ -92,6 +93,7 @@
+ #define current_vt (this->hidden->current_vt)
+ #define saved_vt (this->hidden->saved_vt)
+ #define keyboard_fd (this->hidden->keyboard_fd)
++#define rc_fd (this->hidden->rc_fd)
+ #define saved_kbd_mode (this->hidden->saved_kbd_mode)
+ #define saved_kbd_termios (this->hidden->saved_kbd_termios)
+ #define mouse_fd (this->hidden->mouse_fd)
+diff -Naur SDL-1.2.6/ltconfig SDL-1.2.6.patched/ltconfig
+--- SDL-1.2.6/ltconfig 2003-08-30 21:13:00.000000000 +0200
++++ SDL-1.2.6.patched/ltconfig 2004-11-20 18:18:14.000000000 +0100
+@@ -2107,7 +2107,6 @@
+ else
+ # Only the GNU ld.so supports shared libraries on MkLinux.
+ case "$host_cpu" in
+- powerpc*) dynamic_linker=no ;;
+ *) dynamic_linker='Linux ld.so' ;;
+ esac
+ fi
+diff -Naur SDL-1.2.6/src/video/fbcon/SDL_fbvideo.c SDL-1.2.6.patched/src/video/fbcon/SDL_fbvideo.c
+--- SDL-1.2.6/src/video/fbcon/SDL_fbvideo.c 2003-08-30 21:13:09.000000000 +0200
++++ SDL-1.2.6.patched/src/video/fbcon/SDL_fbvideo.c 2004-11-20 18:35:29.000000000 +0100
+@@ -97,6 +99,7 @@
+ #ifdef USE_VESA_TIMINGS /* Only tested on Matrox Millenium I */
+ { 640, 400, 39771, 48, 16, 39, 8, 96, 2, 2, 0 }, /* 70 Hz */
+ { 640, 480, 39683, 48, 16, 33, 10, 96, 2, 0, 0 }, /* 60 Hz */
++ { 720, 576, 26101, 144, 16, 28, 6, 112, 4, 0, 0 }, /* BLA */
+ { 768, 576, 26101, 144, 16, 28, 6, 112, 4, 0, 0 }, /* 60 Hz */
+ { 800, 600, 24038, 144, 24, 28, 8, 112, 6, 0, 0 }, /* 60 Hz */
+ { 960, 720, 17686, 144, 24, 28, 8, 112, 4, 0, 0 }, /* 60 Hz */
+@@ -115,6 +118,7 @@
+ { 512, 384, 49603, 48, 16, 16, 1, 64, 3, 0, 0 }, /* 78 Hz */
+ { 640, 400, 31746, 96, 32, 41, 1, 64, 3, 2, 0 }, /* 85 Hz */
+ { 640, 480, 31746, 120, 16, 16, 1, 64, 3, 0, 0 }, /* 75 Hz */
++ { 720, 576, 26101, 144, 16, 18, 6, 112, 4, 0, 0 },
+ { 768, 576, 26101, 144, 16, 28, 6, 112, 4, 0, 0 }, /* 60 Hz */
+ { 800, 600, 20000, 64, 56, 23, 37, 120, 6, 3, 0 }, /* 72 Hz */
+ { 960, 720, 17686, 144, 24, 28, 8, 112, 4, 0, 0 }, /* 60 Hz */
+@@ -161,7 +165,7 @@
SDL_fbdev = getenv("SDL_FBDEV");
if ( SDL_fbdev == NULL ) {
@@ -302,7 +348,7 @@
}
console = open(SDL_fbdev, O_RDWR, 0);
if ( console >= 0 ) {
-@@ -336,7 +336,7 @@
+@@ -336,7 +340,7 @@
/* Initialize the library */
SDL_fbdev = getenv("SDL_FBDEV");
if ( SDL_fbdev == NULL ) {
@@ -311,60 +357,3 @@
}
console_fd = open(SDL_fbdev, O_RDWR, 0);
if ( console_fd < 0 ) {
-diff -Naur Archive/SDL-1.2.4.orig/src/video/fbcon/SDL_fbvideo.c.rej SDL-1.2.4/src/video/fbcon/SDL_fbvideo.c.rej
---- Archive/SDL-1.2.4.orig/src/video/fbcon/SDL_fbvideo.c.rej 1970-01-01 01:00:00.000000000 +0100
-+++ SDL-1.2.4/src/video/fbcon/SDL_fbvideo.c.rej 2002-08-19 05:26:28.000000000 +0200
-@@ -0,0 +1,34 @@
-+***************
-+*** 161,167 ****
-+
-+ SDL_fbdev = getenv("SDL_FBDEV");
-+ if ( SDL_fbdev == NULL ) {
-+- SDL_fbdev = "/dev/fb0";
-+ }
-+ console = open(SDL_fbdev, O_RDWR, 0);
-+ if ( console >= 0 ) {
-+--- 161,167 ----
-+
-+ SDL_fbdev = getenv("SDL_FBDEV");
-+ if ( SDL_fbdev == NULL ) {
-++ SDL_fbdev = "/dev/fb/0";
-+ }
-+ console = open(SDL_fbdev, O_RDWR, 0);
-+ if ( console >= 0 ) {
-+***************
-+*** 336,342 ****
-+ /* Initialize the library */
-+ SDL_fbdev = getenv("SDL_FBDEV");
-+ if ( SDL_fbdev == NULL ) {
-+- SDL_fbdev = "/dev/fb0";
-+ }
-+ console_fd = open(SDL_fbdev, O_RDWR, 0);
-+ if ( console_fd < 0 ) {
-+--- 336,342 ----
-+ /* Initialize the library */
-+ SDL_fbdev = getenv("SDL_FBDEV");
-+ if ( SDL_fbdev == NULL ) {
-++ SDL_fbdev = "/dev/fb/0";
-+ }
-+ console_fd = open(SDL_fbdev, O_RDWR, 0);
-+ if ( console_fd < 0 ) {
-diff -Naur Archive/SDL-1.2.4.orig/src/video/fbcon/SDL_fbvideo.h SDL-1.2.4/src/video/fbcon/SDL_fbvideo.h
---- Archive/SDL-1.2.4.orig/src/video/fbcon/SDL_fbvideo.h 2002-03-06 12:23:04.000000000 +0100
-+++ SDL-1.2.4/src/video/fbcon/SDL_fbvideo.h 2002-08-19 05:25:36.000000000 +0200
-@@ -61,6 +61,7 @@
- int current_vt;
- int saved_vt;
- int keyboard_fd;
-+ int rc_fd;
- int saved_kbd_mode;
- struct termios saved_kbd_termios;
-
-@@ -92,6 +93,7 @@
- #define current_vt (this->hidden->current_vt)
- #define saved_vt (this->hidden->saved_vt)
- #define keyboard_fd (this->hidden->keyboard_fd)
-+#define rc_fd (this->hidden->rc_fd)
- #define saved_kbd_mode (this->hidden->saved_kbd_mode)
- #define saved_kbd_termios (this->hidden->saved_kbd_termios)
- #define mouse_fd (this->hidden->mouse_fd)
1.2.6.1 +7 -76 cdk/Patches/Attic/zlib.diff
file : http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/zlib.diff?rev=1.2.6.1&content-type=text/vnd.viewcvs-markup
plain: http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/zlib.diff?rev=1.2.6.1&content-type=text/plain
revision graph: http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/zlib.diff?graph=1.2.6.1
diff : http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/zlib.diff.diff?r1=1.2&r2=1.2.6.1
Index: zlib.diff
===================================================================
RCS file: /cvs/tuxbox/cdk/Patches/Attic/zlib.diff,v
retrieving revision 1.2
retrieving revision 1.2.6.1
diff -u -r1.2 -r1.2.6.1
--- zlib.diff 1 Jun 2002 18:04:02 -0000 1.2
+++ zlib.diff 4 Feb 2005 18:04:42 -0000 1.2.6.1
@@ -1,80 +1,11 @@
-diff -urN zlib-1.1.4.orig/Makefile zlib-1.1.4/Makefile
---- zlib-1.1.4.orig/Makefile Mon Mar 11 14:58:30 2002
-+++ zlib-1.1.4/Makefile Sat Jun 1 19:41:22 2002
-@@ -12,20 +12,20 @@
- # To install in $HOME instead of /usr/local, use:
- # make install prefix=$HOME
+--- zlib-1.2.1/Makefile.in.orig 2003-11-09 03:29:23.000000000 +0100
++++ zlib-1.2.1/Makefile.in 2004-09-13 22:13:18.000000000 +0200
+@@ -54,7 +54,7 @@
--CC=cc
-+CC=gcc
+ TEST_OBJS = example.o minigzip.o
--CFLAGS=-O
-+CFLAGS=-fPIC -O3 -DHAVE_UNISTD_H -DUSE_MMAP
- #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
- #CFLAGS=-g -DDEBUG
- #CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
- # -Wstrict-prototypes -Wmissing-prototypes
-
- LDFLAGS=-L. -lz
--LDSHARED=$(CC)
--CPP=$(CC) -E
-+LDSHARED=gcc -shared -Wl,-soname,libz.so.1
-+CPP=gcc -E
-
- VER=1.1.4
--LIBS=libz.a
-+LIBS=libz.so.1.1.4
- SHAREDLIB=libz.so
-
- AR=ar rc
-@@ -33,10 +33,10 @@
- TAR=tar
- SHELL=/bin/sh
-
--prefix = /usr/local
--exec_prefix = ${prefix}
--libdir = ${exec_prefix}/lib
--includedir = ${prefix}/include
-+prefix =/usr/local
-+exec_prefix =${prefix}
-+libdir =${exec_prefix}/lib
-+includedir =${prefix}/include
-
- OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
- zutil.o inflate.o infblock.o inftrees.o infcodes.o infutil.o inffast.o
-diff -urN zlib-1.1.4.orig/Makefile.in zlib-1.1.4/Makefile.in
---- zlib-1.1.4.orig/Makefile.in Mon Mar 11 14:58:30 2002
-+++ zlib-1.1.4/Makefile.in Sat Jun 1 19:43:26 2002
-@@ -58,7 +58,10 @@
- contrib/minizip/[CM]*[pe] contrib/minizip/*.[ch] contrib/minizip/*.[td]?? \
- contrib/delphi*/*.???
-
--all: example minigzip
-+all: $(SHAREDLIB).$(VER)
-+
-+.c.o:
-+ $(CC) -c $(CFLAGS) -fPIC -o $@ $*.c
+-all: example$(EXE) minigzip$(EXE)
++all:
+ check: test
test: all
- @LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \
-@@ -81,7 +84,7 @@
- rm -f _match.s
-
- $(SHAREDLIB).$(VER): $(OBJS)
-- $(LDSHARED) -o $@ $(OBJS)
-+ $(LDSHARED) -o $@ $(OBJS) -lc
- rm -f $(SHAREDLIB) $(SHAREDLIB).1
- ln -s $@ $(SHAREDLIB)
- ln -s $@ $(SHAREDLIB).1
-diff -urN zlib-1.1.4.orig/configure zlib-1.1.4/configure
---- zlib-1.1.4.orig/configure Wed Jul 8 20:19:35 1998
-+++ zlib-1.1.4/configure Sat Jun 1 19:43:26 2002
-@@ -72,7 +72,7 @@
- SFLAGS=${CFLAGS-"-fPIC -O3"}
- CFLAGS="$cflags"
- case `(uname -s || echo unknown) 2>/dev/null` in
-- Linux | linux) LDSHARED=${LDSHARED-"gcc -shared -Wl,-soname,libz.so.1"};;
-+ Linux | linux) LDSHARED=${LDSHARED-"$CC -shared -Wl,-soname,libz.so.1"};;
- *) LDSHARED=${LDSHARED-"gcc -shared"};;
- esac
- else
No revision
No revision
1.1.2.1 +14 -0 cdk/Patches/Attic/default_lc.esml.diff
file : http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/default_lc.esml.diff?rev=1.1.2.1&content-type=text/vnd.viewcvs-markup
plain: http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/default_lc.esml.diff?rev=1.1.2.1&content-type=text/plain
revision graph: http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/default_lc.esml.diff?graph=1.1.2.1
diff : http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/default_lc.esml.diff.diff?r1=1.1&r2=1.1.2.1
1.1.2.1 +12 -0 cdk/Patches/Attic/etherwake.diff
file : http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/etherwake.diff?rev=1.1.2.1&content-type=text/vnd.viewcvs-markup
plain: http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/etherwake.diff?rev=1.1.2.1&content-type=text/plain
revision graph: http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/etherwake.diff?graph=1.1.2.1
diff : http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/etherwake.diff.diff?r1=1.1&r2=1.1.2.1
1.1.2.1 +36 -0 cdk/Patches/Attic/gcc-g++.diff
file : http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/gcc-g++.diff?rev=1.1.2.1&content-type=text/vnd.viewcvs-markup
plain: http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/gcc-g++.diff?rev=1.1.2.1&content-type=text/plain
revision graph: http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/gcc-g++.diff?graph=1.1.2.1
diff : http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/gcc-g++.diff.diff?r1=1.1&r2=1.1.2.1
1.1.2.1 +4633 -0 cdk/Patches/Attic/gcc-ibmppc4xx_fp_perflib.diff
file : http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/gcc-ibmppc4xx_fp_perflib.diff?rev=1.1.2.1&content-type=text/vnd.viewcvs-markup
plain: http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/gcc-ibmppc4xx_fp_perflib.diff?rev=1.1.2.1&content-type=text/plain
revision graph: http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/gcc-ibmppc4xx_fp_perflib.diff?graph=1.1.2.1
diff : http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/gcc-ibmppc4xx_fp_perflib.diff.diff?r1=1.1&r2=1.1.2.1
1.1.2.1 +3516 -0 cdk/Patches/Attic/gdb-6.3-5.diff
file : http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/gdb-6.3-5.diff?rev=1.1.2.1&content-type=text/vnd.viewcvs-markup
plain: http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/gdb-6.3-5.diff?rev=1.1.2.1&content-type=text/plain
revision graph: http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/gdb-6.3-5.diff?graph=1.1.2.1
diff : http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/gdb-6.3-5.diff.diff?r1=1.1&r2=1.1.2.1
1.1.2.1 +5193 -0 cdk/Patches/Attic/glibc-ibmppc4xx_fp_perflib.diff
file : http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/glibc-ibmppc4xx_fp_perflib.diff?rev=1.1.2.1&content-type=text/vnd.viewcvs-markup
plain: http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/glibc-ibmppc4xx_fp_perflib.diff?rev=1.1.2.1&content-type=text/plain
revision graph: http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/glibc-ibmppc4xx_fp_perflib.diff?graph=1.1.2.1
diff : http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/glibc-ibmppc4xx_fp_perflib.diff.diff?r1=1.1&r2=1.1.2.1
1.1.2.1 +2705 -0 cdk/Patches/Attic/glibc_ppc4xx_ibmstropt.diff
file : http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/glibc_ppc4xx_ibmstropt.diff?rev=1.1.2.1&content-type=text/vnd.viewcvs-markup
plain: http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/glibc_ppc4xx_ibmstropt.diff?rev=1.1.2.1&content-type=text/plain
revision graph: http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/glibc_ppc4xx_ibmstropt.diff?graph=1.1.2.1
diff : http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/glibc_ppc4xx_ibmstropt.diff.diff?r1=1.1&r2=1.1.2.1
1.1.4.1 +34 -0 cdk/Patches/Attic/libungif.diff
file : http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/libungif.diff?rev=1.1.4.1&content-type=text/vnd.viewcvs-markup
plain: http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/libungif.diff?rev=1.1.4.1&content-type=text/plain
revision graph: http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/libungif.diff?graph=1.1.4.1
diff : http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/libungif.diff.diff?r1=1.1&r2=1.1.4.1
1.1.2.1 +20 -0 cdk/Patches/Attic/linux-libc-headers.diff
file : http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/linux-libc-headers.diff?rev=1.1.2.1&content-type=text/vnd.viewcvs-markup
plain: http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/linux-libc-headers.diff?rev=1.1.2.1&content-type=text/plain
revision graph: http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/linux-libc-headers.diff?graph=1.1.2.1
diff : http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/linux-libc-headers.diff.diff?r1=1.1&r2=1.1.2.1
1.1.2.1 +97 -0 cdk/Patches/Attic/reiserfsprogs_add_credits.diff
file : http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/reiserfsprogs_add_credits.diff?rev=1.1.2.1&content-type=text/vnd.viewcvs-markup
plain: http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/reiserfsprogs_add_credits.diff?rev=1.1.2.1&content-type=text/plain
revision graph: http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/reiserfsprogs_add_credits.diff?graph=1.1.2.1
diff : http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/reiserfsprogs_add_credits.diff.diff?r1=1.1&r2=1.1.2.1
1.1.2.1 +118 -0 cdk/Patches/Attic/samba_ppc.diff
file : http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/samba_ppc.diff?rev=1.1.2.1&content-type=text/vnd.viewcvs-markup
plain: http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/samba_ppc.diff?rev=1.1.2.1&content-type=text/plain
revision graph: http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/samba_ppc.diff?graph=1.1.2.1
diff : http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/samba_ppc.diff.diff?r1=1.1&r2=1.1.2.1
1.1.2.1 +90 -0 cdk/Patches/Attic/util-linux.diff
file : http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/util-linux.diff?rev=1.1.2.1&content-type=text/vnd.viewcvs-markup
plain: http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/util-linux.diff?rev=1.1.2.1&content-type=text/plain
revision graph: http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/util-linux.diff?graph=1.1.2.1
diff : http://cvs.tuxbox.org/tuxbox/cdk/Patches/Attic/util-linux.diff.diff?r1=1.1&r2=1.1.2.1
--
To UNSUBSCRIBE, email to tuxbox-cvs-request@cvs.tuxbox.org
with a subject of "unsubscribe". Trouble? Contact listmaster@cvs.tuxbox.org