Source File section

Usermanager Section

File created: mylinux-usermanager-0.98/MyLinux-Patches/dump-kernelheader.patch

--- dump/main.c-orig	2004-07-05 17:12:45.000000000 +0200
+++ dump/main.c	2004-11-04 15:30:35.000000000 +0100
@@ -67,7 +67,8 @@
 #include <ext2fs/ext2fs.h>
 #include <sys/stat.h>
 #include <bsdcompat.h>
-#include <linux/fs.h>	/* for definition of BLKFLSBUF */
+/* #include <linux/fs.h>	* for definition of BLKFLSBUF */
+#define BLKFLSBUF  _IO(0x12,97) /* flush buffer cache */
 #elif defined sunos
 #include <sys/vnode.h>
 

File created: mylinux-usermanager-0.98/MyLinux-Patches/kernel26-headers.patch

diff -Naur linux-2.6.9/include/asm/irq.h linux-2.6.9/include/asm/irq.h
--- linux-2.6.9/include/asm/irq.h	2004-10-18 23:54:38.000000000 +0200
+++ linux-2.6.9/include/asm/irq.h	2004-11-04 16:26:13.000000000 +0100
@@ -13,7 +13,7 @@
 #include <linux/config.h>
 #include <linux/sched.h>
 /* include comes from machine specific directory */
-#include "irq_vectors.h"
+#include "mach-default/irq_vectors.h"
 #include <linux-2.6.9/include/asm/thread_info.h>
 
 static __inline__ int irq_canonicalize(int irq)
diff -Naur linux-2.6.9/include/asm/mpspec.h linux-2.6.9/include/asm/mpspec.h
--- linux-2.6.9/include/asm/mpspec.h	2004-10-18 23:53:05.000000000 +0200
+++ linux-2.6.9/include/asm/mpspec.h	2004-11-04 16:27:00.000000000 +0100
@@ -3,7 +3,7 @@
 
 #include <linux/cpumask.h>
 #include <linux-2.6.9/include/asm/mpspec_def.h>
-#include <mach_mpspec.h>
+#include <linux-2.6.9/include/asm/mach-default/mach_mpspec.h>
 
 extern int mp_bus_id_to_type [MAX_MP_BUSSES];
 extern int mp_bus_id_to_node [MAX_MP_BUSSES];
diff -Naur linux-2.6.9/include/asm/smp.h linux-2.6.9/include/asm/smp.h
--- linux-2.6.9/include/asm/smp.h	2004-10-18 23:55:36.000000000 +0200
+++ linux-2.6.9/include/asm/smp.h	2004-11-04 16:27:21.000000000 +0100
@@ -69,7 +69,7 @@
 #ifdef APIC_DEFINITION
 extern int hard_smp_processor_id(void);
 #else
-#include <mach_apicdef.h>
+#include <linux-2.6.9/include/asm/mach-default/mach_apicdef.h>
 static inline int hard_smp_processor_id(void)
 {
 	/* we don't want to mark this access volatile - bad code generation */
diff -Naur linux-2.6.9/include/linux/smb_fs.h linux-2.6.9/include/linux/smb_fs.h
--- linux-2.6.9/include/linux/smb_fs.h	2004-11-04 13:01:48.000000000 +0100
+++ linux-2.6.9/include/linux/smb_fs.h	2004-11-04 13:02:43.000000000 +0100
@@ -12,7 +12,6 @@
 #include <linux/smb.h>
 #include <linux/smb_fs_i.h>
 #include <linux/smb_fs_sb.h>
-#include <linux/fs.h>
 
 /*
  * ioctl commands
@@ -26,6 +25,7 @@
 
 #ifdef __KERNEL__
 
+#include <linux/fs.h>
 #include <linux/pagemap.h>
 #include <linux/vmalloc.h>
 #include <linux/smb_mount.h>
diff -Naur linux-2.6.9/include/linux/types.h linux-2.6.9/include/linux/types.h
--- linux-2.6.9/include/linux/types.h	2004-10-18 23:55:06.000000000 +0200
+++ linux-2.6.9/include/linux/types.h	2004-11-04 16:56:22.000000000 +0100
@@ -140,6 +140,13 @@
 #define pgoff_t unsigned long
 #endif
 
+#endif /* __KERNEL_STRICT_NAMES */
+
+/*
+ * Below are truly Linux-specific types that should never collide with
+ * any application/library that wants linux/types.h.
+ */
+
 #ifdef __CHECKER__
 #define __bitwise __attribute__((bitwise))
 #else
@@ -153,13 +160,6 @@
 typedef __u64 __bitwise __le64;
 typedef __u64 __bitwise __be64;
 
-#endif /* __KERNEL_STRICT_NAMES */
-
-/*
- * Below are truly Linux-specific types that should never collide with
- * any application/library that wants linux/types.h.
- */
-
 struct ustat {
 	__kernel_daddr_t	f_tfree;
 	__kernel_ino_t		f_tinode;

File changed: mylinux-usermanager-0.98/MyLinux-Patches/util-linux.patch

3c3
< +++ util-linux-2.12b-adj/configure 2004-10-25 19:43:29.259856848 +0200
---
> +++ util-linux-2.12b/configure 2004-10-25 19:43:29.259856848 +0200
14c14
< +++ util-linux-2.12b-adj/sys-utils/cytune.c 2004-10-25 19:44:27.892943264 +0200
---
> +++ util-linux-2.12b/sys-utils/cytune.c 2004-10-25 19:44:27.892943264 +0200

File changed: mylinux-usermanager-0.98/compile-scripts/COMPILE-MYLINUX

1573,1579c1573,1576
< # since myLinux 0.96 Samba is only compiled here, therefore nothing
< # has to be deleted
< ## it's necessary to delete the config.cache in order to recompile
< ## samba with --with-ldapsam; otherwise the cached information that
< ## there is no openldap installed cannot be overridden
< #make clean
< #rm config.cache
---
> # This requires the kernel header patches of myLinux; among other changes
> # the patch modifies the kernel header file /usr/include/linux/smb_fs.h
> # which is only needed for 2.6.x kernels; for these the inclusion of
> # fs.h is only safe inside the __KERNEL__ area
1821c1818,1819
< cd /MyLinux-Sources/dump-0.4b36/
---
> cd /MyLinux-Sources/dump-0.4b37/
> patch -Np1 -i /MyLinux-Patches/dump-kernelheader.patch
3193,3198c3191,3210
< make
< make install
< for i in 0 1 2 3 4 5 6 7 8 9
< do
<   mknod /dev/cloop$i b 240 $i
< done
---
> # Originally, cloop places the module in /lib/modules/misc, which is
> # theoretically independent from the loaded kernel. This works, if
> # the kernel is changed from 2.4.x to 2.4.y, but does not work with
> # kernel 2.6. The cloop version here is patched for working with
> # kernel 2.6, but places the module only in
> # /lib/modules/<kernel version number>. The version number is detected
> # with uname -r. If you are compiling myLinux, this version may differ
> # from the one choosen in the compiled myLinux system. So we have to
> # replace uname here. depmod should be called with explicit version
> # number, too. And modprobe cannot be called in a changed root
> # environment.
> mv Makefile Makefile-orig
> cat Makefile-orig | sed \
>   -e 's@/lib/modules/\$(shell uname -r)@/lib/modules/2.6.9@' \
>   -e 's@depmod -a@depmod -a 2.6.9@' \
>   -e 's@modprobe cloop@@' \
>   > Makefile
> make || exit 1
> make install || exit 1
> # The patched cloop version creates the /dev/cloop* files automatically.

File changed: mylinux-usermanager-0.98/compile-scripts/COMPILE-RUNTIME3

92,93c92
< cd ../e2fsprogs-1.32/
< patch -Np1 -i /MyLinux-Patches/e2fsprogs-kernel26.patch
---
> cd ../e2fsprogs-1.35/
96c95
< ../e2fsprogs-1.32/configure --prefix=/usr --with-root-prefix="" --enable-elf-shlibs
---
> ../e2fsprogs-1.35/configure --prefix=/usr --with-root-prefix="" --enable-elf-shlibs

File changed: mylinux-usermanager-0.98/compile-scripts/COMPILE-STATIC

159,166c159,169
< ##############################################################
< # util-linux                                                 #
< ##############################################################
< cd ../util-linux-2.11y/
< LDFLAGS="-static" ./configure
< make -C lib || exit 1
< make -C mount mount umount || exit 1
< cp mount/{mount,umount} $LFS/static/bin
---
> ###############################################################
> ## util-linux                                                 #
> ###############################################################
> #cd ../util-linux-2.12h/
> #cp configure configure.backup
> #sed "s@/usr/include@/static/include@g" configure.backup > configure
> #LDFLAGS="-static" ./configure
> #make -C lib || exit 1
> #make -C mount mount umount || exit 1
> #make -C text-utils more
> #cp mount/{mount,umount} text-utils/more $LFS/static/bin

File changed: mylinux-usermanager-0.98/compile-scripts/MAIN

96a97,98
> mount -t proc proc $LFS/proc
> 

File changed: mylinux-usermanager-0.98/compile-scripts/MAKEKERNEL-HEADERS

30a31
> patch -Np1 -i /MyLinux-Patches/kernel26-headers.patch

File changed: mylinux-usermanager-0.98/compile-scripts/MAKETREE

46c46
< mount proc /proc -t proc
---
> #mount proc /proc -t proc