From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 7e5cbd938bb3d62182689aac0a2ac27c609c4515
Date: Tue, 13 Nov 2012 18:29:45 +0100 [thread overview]
Message-ID: <20121113172946.17062200C1@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 77553 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, thirteen has been updated
via 7e5cbd938bb3d62182689aac0a2ac27c609c4515 (commit)
via cc24c14bfe52558aceb4489c8ef7a94fbe79edb0 (commit)
via aaddc86cbfea0da30b88a03c326c097562f38b9d (commit)
via 94385278fb924524a1781a9ddcc8f42e949ec2c0 (commit)
via 10c30c2066a4c0fd74f7ac6da33005927faec57f (commit)
via 0f8a5b08565b456681562f5c8dcd4df7477b1d47 (commit)
via 7343fdaf6e7e2619c3be2008ddb261462fb92ea9 (commit)
from 6fead212add7e93df5a5f9affab71679f438888f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7e5cbd938bb3d62182689aac0a2ac27c609c4515
Merge: cc24c14 6fead21
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Nov 13 18:29:13 2012 +0100
Merge branch 'thirteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into thirteen
commit cc24c14bfe52558aceb4489c8ef7a94fbe79edb0
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Nov 13 18:26:28 2012 +0100
linux-headers: use kernel 3.2.x headers.
commit aaddc86cbfea0da30b88a03c326c097562f38b9d
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Nov 13 18:25:35 2012 +0100
compat-wireless: updated to 3.6.6-1-snp.
commit 94385278fb924524a1781a9ddcc8f42e949ec2c0
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Nov 13 18:25:07 2012 +0100
w_scan: update to 20121111.
commit 10c30c2066a4c0fd74f7ac6da33005927faec57f
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Nov 13 08:51:39 2012 +0100
initskripts: acpid need syslog.
also added stop at shutdown to suppress ugly messages on console.
commit 0f8a5b08565b456681562f5c8dcd4df7477b1d47
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Nov 13 08:44:34 2012 +0100
initskripts: sendsignal - print ok if no processes are left.
commit 7343fdaf6e7e2619c3be2008ddb261462fb92ea9
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Nov 13 06:40:25 2012 +0100
iptables: rootfile update.
-----------------------------------------------------------------------
Summary of changes:
config/include/obsolete_videodev.h | 320 ++++++++++++++++++++
config/rootfiles/common/i586/glibc | 1 +
config/rootfiles/common/i586/initscripts | 4 +-
.../common/i586/{linux2 => linux-headers} | 77 ++++-
config/rootfiles/common/iptables | 16 +
config/rootfiles/packages/w_scan | 4 +-
lfs/compat-wireless | 4 +-
lfs/initscripts | 4 +-
lfs/linux | 10 +-
lfs/motion | 8 +
lfs/vdr | 9 +-
lfs/w_scan | 16 +-
make.sh | 4 +-
src/initscripts/init.d/sendsignals | 4 +-
src/patches/w_scan-ipfire.patch | 130 --------
15 files changed, 441 insertions(+), 170 deletions(-)
create mode 100644 config/include/obsolete_videodev.h
rename config/rootfiles/common/i586/{linux2 => linux-headers} (90%)
delete mode 100644 src/patches/w_scan-ipfire.patch
Difference in files:
diff --git a/config/include/obsolete_videodev.h b/config/include/obsolete_videodev.h
new file mode 100644
index 0000000..c51a5f9
--- /dev/null
+++ b/config/include/obsolete_videodev.h
@@ -0,0 +1,320 @@
+/*
+ * Video for Linux version 1 - OBSOLETE
+ *
+ * Header file for v4l1 drivers and applications, for
+ * Linux kernels 2.2.x or 2.4.x.
+ *
+ * Provides header for legacy drivers and applications
+ *
+ * See http://linuxtv.org for more info
+ *
+ */
+#ifndef __LINUX_VIDEODEV_H
+#define __LINUX_VIDEODEV_H
+
+#include <linux/types.h>
+#include <linux/ioctl.h>
+#include <linux/videodev2.h>
+
+
+#define VID_TYPE_CAPTURE 1 /* Can capture */
+#define VID_TYPE_TUNER 2 /* Can tune */
+#define VID_TYPE_TELETEXT 4 /* Does teletext */
+#define VID_TYPE_OVERLAY 8 /* Overlay onto frame buffer */
+#define VID_TYPE_CHROMAKEY 16 /* Overlay by chromakey */
+#define VID_TYPE_CLIPPING 32 /* Can clip */
+#define VID_TYPE_FRAMERAM 64 /* Uses the frame buffer memory */
+#define VID_TYPE_SCALES 128 /* Scalable */
+#define VID_TYPE_MONOCHROME 256 /* Monochrome only */
+#define VID_TYPE_SUBCAPTURE 512 /* Can capture subareas of the image */
+#define VID_TYPE_MPEG_DECODER 1024 /* Can decode MPEG streams */
+#define VID_TYPE_MPEG_ENCODER 2048 /* Can encode MPEG streams */
+#define VID_TYPE_MJPEG_DECODER 4096 /* Can decode MJPEG streams */
+#define VID_TYPE_MJPEG_ENCODER 8192 /* Can encode MJPEG streams */
+
+struct video_capability
+{
+ char name[32];
+ int type;
+ int channels; /* Num channels */
+ int audios; /* Num audio devices */
+ int maxwidth; /* Supported width */
+ int maxheight; /* And height */
+ int minwidth; /* Supported width */
+ int minheight; /* And height */
+};
+
+
+struct video_channel
+{
+ int channel;
+ char name[32];
+ int tuners;
+ __u32 flags;
+#define VIDEO_VC_TUNER 1 /* Channel has a tuner */
+#define VIDEO_VC_AUDIO 2 /* Channel has audio */
+ __u16 type;
+#define VIDEO_TYPE_TV 1
+#define VIDEO_TYPE_CAMERA 2
+ __u16 norm; /* Norm set by channel */
+};
+
+struct video_tuner
+{
+ int tuner;
+ char name[32];
+ unsigned long rangelow, rangehigh; /* Tuner range */
+ __u32 flags;
+#define VIDEO_TUNER_PAL 1
+#define VIDEO_TUNER_NTSC 2
+#define VIDEO_TUNER_SECAM 4
+#define VIDEO_TUNER_LOW 8 /* Uses KHz not MHz */
+#define VIDEO_TUNER_NORM 16 /* Tuner can set norm */
+#define VIDEO_TUNER_STEREO_ON 128 /* Tuner is seeing stereo */
+#define VIDEO_TUNER_RDS_ON 256 /* Tuner is seeing an RDS datastream */
+#define VIDEO_TUNER_MBS_ON 512 /* Tuner is seeing an MBS datastream */
+ __u16 mode; /* PAL/NTSC/SECAM/OTHER */
+#define VIDEO_MODE_PAL 0
+#define VIDEO_MODE_NTSC 1
+#define VIDEO_MODE_SECAM 2
+#define VIDEO_MODE_AUTO 3
+ __u16 signal; /* Signal strength 16bit scale */
+};
+
+struct video_picture
+{
+ __u16 brightness;
+ __u16 hue;
+ __u16 colour;
+ __u16 contrast;
+ __u16 whiteness; /* Black and white only */
+ __u16 depth; /* Capture depth */
+ __u16 palette; /* Palette in use */
+#define VIDEO_PALETTE_GREY 1 /* Linear greyscale */
+#define VIDEO_PALETTE_HI240 2 /* High 240 cube (BT848) */
+#define VIDEO_PALETTE_RGB565 3 /* 565 16 bit RGB */
+#define VIDEO_PALETTE_RGB24 4 /* 24bit RGB */
+#define VIDEO_PALETTE_RGB32 5 /* 32bit RGB */
+#define VIDEO_PALETTE_RGB555 6 /* 555 15bit RGB */
+#define VIDEO_PALETTE_YUV422 7 /* YUV422 capture */
+#define VIDEO_PALETTE_YUYV 8
+#define VIDEO_PALETTE_UYVY 9 /* The great thing about standards is ... */
+#define VIDEO_PALETTE_YUV420 10
+#define VIDEO_PALETTE_YUV411 11 /* YUV411 capture */
+#define VIDEO_PALETTE_RAW 12 /* RAW capture (BT848) */
+#define VIDEO_PALETTE_YUV422P 13 /* YUV 4:2:2 Planar */
+#define VIDEO_PALETTE_YUV411P 14 /* YUV 4:1:1 Planar */
+#define VIDEO_PALETTE_YUV420P 15 /* YUV 4:2:0 Planar */
+#define VIDEO_PALETTE_YUV410P 16 /* YUV 4:1:0 Planar */
+#define VIDEO_PALETTE_PLANAR 13 /* start of planar entries */
+#define VIDEO_PALETTE_COMPONENT 7 /* start of component entries */
+};
+
+struct video_audio
+{
+ int audio; /* Audio channel */
+ __u16 volume; /* If settable */
+ __u16 bass, treble;
+ __u32 flags;
+#define VIDEO_AUDIO_MUTE 1
+#define VIDEO_AUDIO_MUTABLE 2
+#define VIDEO_AUDIO_VOLUME 4
+#define VIDEO_AUDIO_BASS 8
+#define VIDEO_AUDIO_TREBLE 16
+#define VIDEO_AUDIO_BALANCE 32
+ char name[16];
+#define VIDEO_SOUND_MONO 1
+#define VIDEO_SOUND_STEREO 2
+#define VIDEO_SOUND_LANG1 4
+#define VIDEO_SOUND_LANG2 8
+ __u16 mode;
+ __u16 balance; /* Stereo balance */
+ __u16 step; /* Step actual volume uses */
+};
+
+struct video_clip
+{
+ __s32 x,y;
+ __s32 width, height;
+ struct video_clip *next; /* For user use/driver use only */
+};
+
+struct video_window
+{
+ __u32 x,y; /* Position of window */
+ __u32 width,height; /* Its size */
+ __u32 chromakey;
+ __u32 flags;
+ struct video_clip *clips; /* Set only */
+ int clipcount;
+#define VIDEO_WINDOW_INTERLACE 1
+#define VIDEO_WINDOW_CHROMAKEY 16 /* Overlay by chromakey */
+#define VIDEO_CLIP_BITMAP -1
+/* bitmap is 1024x625, a '1' bit represents a clipped pixel */
+#define VIDEO_CLIPMAP_SIZE (128 * 625)
+};
+
+struct video_capture
+{
+ __u32 x,y; /* Offsets into image */
+ __u32 width, height; /* Area to capture */
+ __u16 decimation; /* Decimation divider */
+ __u16 flags; /* Flags for capture */
+#define VIDEO_CAPTURE_ODD 0 /* Temporal */
+#define VIDEO_CAPTURE_EVEN 1
+};
+
+struct video_buffer
+{
+ void *base;
+ int height,width;
+ int depth;
+ int bytesperline;
+};
+
+struct video_mmap
+{
+ unsigned int frame; /* Frame (0 - n) for double buffer */
+ int height,width;
+ unsigned int format; /* should be VIDEO_PALETTE_* */
+};
+
+struct video_key
+{
+ __u8 key[8];
+ __u32 flags;
+};
+
+struct video_mbuf
+{
+ int size; /* Total memory to map */
+ int frames; /* Frames */
+ int offsets[VIDEO_MAX_FRAME];
+};
+
+#define VIDEO_NO_UNIT (-1)
+
+struct video_unit
+{
+ int video; /* Video minor */
+ int vbi; /* VBI minor */
+ int radio; /* Radio minor */
+ int audio; /* Audio minor */
+ int teletext; /* Teletext minor */
+};
+
+struct vbi_format {
+ __u32 sampling_rate; /* in Hz */
+ __u32 samples_per_line;
+ __u32 sample_format; /* VIDEO_PALETTE_RAW only (1 byte) */
+ __s32 start[2]; /* starting line for each frame */
+ __u32 count[2]; /* count of lines for each frame */
+ __u32 flags;
+#define VBI_UNSYNC 1 /* can distingues between top/bottom field */
+#define VBI_INTERLACED 2 /* lines are interlaced */
+};
+
+/* video_info is biased towards hardware mpeg encode/decode */
+/* but it could apply generically to any hardware compressor/decompressor */
+struct video_info
+{
+ __u32 frame_count; /* frames output since decode/encode began */
+ __u32 h_size; /* current unscaled horizontal size */
+ __u32 v_size; /* current unscaled veritcal size */
+ __u32 smpte_timecode; /* current SMPTE timecode (for current GOP) */
+ __u32 picture_type; /* current picture type */
+ __u32 temporal_reference; /* current temporal reference */
+ __u8 user_data[256]; /* user data last found in compressed stream */
+ /* user_data[0] contains user data flags, user_data[1] has count */
+};
+
+/* generic structure for setting playback modes */
+struct video_play_mode
+{
+ int mode;
+ int p1;
+ int p2;
+};
+
+/* for loading microcode / fpga programming */
+struct video_code
+{
+ char loadwhat[16]; /* name or tag of file being passed */
+ int datasize;
+ __u8 *data;
+};
+
+#define VIDIOCGCAP _IOR('v',1,struct video_capability) /* Get capabilities */
+#define VIDIOCGCHAN _IOWR('v',2,struct video_channel) /* Get channel info (sources) */
+#define VIDIOCSCHAN _IOW('v',3,struct video_channel) /* Set channel */
+#define VIDIOCGTUNER _IOWR('v',4,struct video_tuner) /* Get tuner abilities */
+#define VIDIOCSTUNER _IOW('v',5,struct video_tuner) /* Tune the tuner for the current channel */
+#define VIDIOCGPICT _IOR('v',6,struct video_picture) /* Get picture properties */
+#define VIDIOCSPICT _IOW('v',7,struct video_picture) /* Set picture properties */
+#define VIDIOCCAPTURE _IOW('v',8,int) /* Start, end capture */
+#define VIDIOCGWIN _IOR('v',9, struct video_window) /* Get the video overlay window */
+#define VIDIOCSWIN _IOW('v',10, struct video_window) /* Set the video overlay window - passes clip list for hardware smarts , chromakey etc */
+#define VIDIOCGFBUF _IOR('v',11, struct video_buffer) /* Get frame buffer */
+#define VIDIOCSFBUF _IOW('v',12, struct video_buffer) /* Set frame buffer - root only */
+#define VIDIOCKEY _IOR('v',13, struct video_key) /* Video key event - to dev 255 is to all - cuts capture on all DMA windows with this key (0xFFFFFFFF == all) */
+#define VIDIOCGFREQ _IOR('v',14, unsigned long) /* Set tuner */
+#define VIDIOCSFREQ _IOW('v',15, unsigned long) /* Set tuner */
+#define VIDIOCGAUDIO _IOR('v',16, struct video_audio) /* Get audio info */
+#define VIDIOCSAUDIO _IOW('v',17, struct video_audio) /* Audio source, mute etc */
+#define VIDIOCSYNC _IOW('v',18, int) /* Sync with mmap grabbing */
+#define VIDIOCMCAPTURE _IOW('v',19, struct video_mmap) /* Grab frames */
+#define VIDIOCGMBUF _IOR('v',20, struct video_mbuf) /* Memory map buffer info */
+#define VIDIOCGUNIT _IOR('v',21, struct video_unit) /* Get attached units */
+#define VIDIOCGCAPTURE _IOR('v',22, struct video_capture) /* Get subcapture */
+#define VIDIOCSCAPTURE _IOW('v',23, struct video_capture) /* Set subcapture */
+#define VIDIOCSPLAYMODE _IOW('v',24, struct video_play_mode) /* Set output video mode/feature */
+#define VIDIOCSWRITEMODE _IOW('v',25, int) /* Set write mode */
+#define VIDIOCGPLAYINFO _IOR('v',26, struct video_info) /* Get current playback info from hardware */
+#define VIDIOCSMICROCODE _IOW('v',27, struct video_code) /* Load microcode into hardware */
+#define VIDIOCGVBIFMT _IOR('v',28, struct vbi_format) /* Get VBI information */
+#define VIDIOCSVBIFMT _IOW('v',29, struct vbi_format) /* Set VBI information */
+
+
+#define BASE_VIDIOCPRIVATE 192 /* 192-255 are private */
+
+/* VIDIOCSWRITEMODE */
+#define VID_WRITE_MPEG_AUD 0
+#define VID_WRITE_MPEG_VID 1
+#define VID_WRITE_OSD 2
+#define VID_WRITE_TTX 3
+#define VID_WRITE_CC 4
+#define VID_WRITE_MJPEG 5
+
+/* VIDIOCSPLAYMODE */
+#define VID_PLAY_VID_OUT_MODE 0
+ /* p1: = VIDEO_MODE_PAL, VIDEO_MODE_NTSC, etc ... */
+#define VID_PLAY_GENLOCK 1
+ /* p1: 0 = OFF, 1 = ON */
+ /* p2: GENLOCK FINE DELAY value */
+#define VID_PLAY_NORMAL 2
+#define VID_PLAY_PAUSE 3
+#define VID_PLAY_SINGLE_FRAME 4
+#define VID_PLAY_FAST_FORWARD 5
+#define VID_PLAY_SLOW_MOTION 6
+#define VID_PLAY_IMMEDIATE_NORMAL 7
+#define VID_PLAY_SWITCH_CHANNELS 8
+#define VID_PLAY_FREEZE_FRAME 9
+#define VID_PLAY_STILL_MODE 10
+#define VID_PLAY_MASTER_MODE 11
+ /* p1: see below */
+#define VID_PLAY_MASTER_NONE 1
+#define VID_PLAY_MASTER_VIDEO 2
+#define VID_PLAY_MASTER_AUDIO 3
+#define VID_PLAY_ACTIVE_SCANLINES 12
+ /* p1 = first active; p2 = last active */
+#define VID_PLAY_RESET 13
+#define VID_PLAY_END_MARK 14
+
+
+#endif /* __LINUX_VIDEODEV_H */
+
+/*
+ * Local variables:
+ * c-basic-offset: 8
+ * End:
+ */
diff --git a/config/rootfiles/common/i586/glibc b/config/rootfiles/common/i586/glibc
index 129475f..ca62948 100644
--- a/config/rootfiles/common/i586/glibc
+++ b/config/rootfiles/common/i586/glibc
@@ -354,6 +354,7 @@ usr/bin/ldd
#usr/include/rpcsvc/yppasswd.x
#usr/include/rpcsvc/ypupd.h
#usr/include/sched.h
+#usr/include/scsi/scsi.h
#usr/include/scsi/scsi_ioctl.h
#usr/include/scsi/sg.h
#usr/include/search.h
diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts
index 8092a16..5bc93d7 100644
--- a/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
@@ -151,6 +151,7 @@ etc/rc.d/rc0.d/K80network
#etc/rc.d/rc0.d/K84bluetooth
#etc/rc.d/rc0.d/K85messagebus
etc/rc.d/rc0.d/K85tmpfs
+etc/rc.d/rc0.d/K87acpid
etc/rc.d/rc0.d/K90sysklogd
etc/rc.d/rc0.d/S60sendsignals
etc/rc.d/rc0.d/S70localnet
@@ -160,6 +161,7 @@ etc/rc.d/rc0.d/S99halt
#etc/rc.d/rc3.d
etc/rc.d/rc3.d/S01tmpfs
etc/rc.d/rc3.d/S10sysklogd
+etc/rc.d/rc3.d/S12acpid
#etc/rc.d/rc3.d/S15messagebus
#etc/rc.d/rc3.d/S16bluetooth
#etc/rc.d/rc3.d/S18cpufreq
@@ -197,6 +199,7 @@ etc/rc.d/rc6.d/K80network
#etc/rc.d/rc6.d/K84bluetooth
#etc/rc.d/rc6.d/K85messagebus
etc/rc.d/rc6.d/K85tmpfs
+etc/rc.d/rc6.d/K87acpid
etc/rc.d/rc6.d/K90sysklogd
etc/rc.d/rc6.d/S60sendsignals
etc/rc.d/rc6.d/S70mountfs
@@ -214,7 +217,6 @@ etc/rc.d/rcsysinit.d/S30checkfs
etc/rc.d/rcsysinit.d/S40mountfs
etc/rc.d/rcsysinit.d/S45udev_retry
etc/rc.d/rcsysinit.d/S50cleanfs
-etc/rc.d/rcsysinit.d/S51acpid
etc/rc.d/rcsysinit.d/S60setclock
etc/rc.d/rcsysinit.d/S70console
etc/rc.d/rcsysinit.d/S75firstsetup
diff --git a/config/rootfiles/common/i586/linux-headers b/config/rootfiles/common/i586/linux-headers
new file mode 100644
index 0000000..e518ab3
--- /dev/null
+++ b/config/rootfiles/common/i586/linux-headers
@@ -0,0 +1,704 @@
+#usr/include/asm
+#usr/include/asm-generic
+#usr/include/asm-generic/auxvec.h
+#usr/include/asm-generic/bitsperlong.h
+#usr/include/asm-generic/errno-base.h
+#usr/include/asm-generic/errno.h
+#usr/include/asm-generic/fcntl.h
+#usr/include/asm-generic/int-l64.h
+#usr/include/asm-generic/int-ll64.h
+#usr/include/asm-generic/ioctl.h
+#usr/include/asm-generic/ioctls.h
+#usr/include/asm-generic/ipcbuf.h
+#usr/include/asm-generic/mman-common.h
+#usr/include/asm-generic/mman.h
+#usr/include/asm-generic/msgbuf.h
+#usr/include/asm-generic/param.h
+#usr/include/asm-generic/poll.h
+#usr/include/asm-generic/posix_types.h
+#usr/include/asm-generic/resource.h
+#usr/include/asm-generic/sembuf.h
+#usr/include/asm-generic/setup.h
+#usr/include/asm-generic/shmbuf.h
+#usr/include/asm-generic/shmparam.h
+#usr/include/asm-generic/siginfo.h
+#usr/include/asm-generic/signal-defs.h
+#usr/include/asm-generic/signal.h
+#usr/include/asm-generic/socket.h
+#usr/include/asm-generic/sockios.h
+#usr/include/asm-generic/stat.h
+#usr/include/asm-generic/statfs.h
+#usr/include/asm-generic/swab.h
+#usr/include/asm-generic/termbits.h
+#usr/include/asm-generic/termios.h
+#usr/include/asm-generic/types.h
+#usr/include/asm-generic/ucontext.h
+#usr/include/asm-generic/unistd.h
+#usr/include/asm/a.out.h
+#usr/include/asm/auxvec.h
+#usr/include/asm/bitsperlong.h
+#usr/include/asm/boot.h
+#usr/include/asm/bootparam.h
+#usr/include/asm/byteorder.h
+#usr/include/asm/debugreg.h
+#usr/include/asm/e820.h
+#usr/include/asm/errno.h
+#usr/include/asm/fcntl.h
+#usr/include/asm/hw_breakpoint.h
+#usr/include/asm/hyperv.h
+#usr/include/asm/ioctl.h
+#usr/include/asm/ioctls.h
+#usr/include/asm/ipcbuf.h
+#usr/include/asm/ist.h
+#usr/include/asm/kvm.h
+#usr/include/asm/kvm_para.h
+#usr/include/asm/ldt.h
+#usr/include/asm/mce.h
+#usr/include/asm/mman.h
+#usr/include/asm/msgbuf.h
+#usr/include/asm/msr-index.h
+#usr/include/asm/msr.h
+#usr/include/asm/mtrr.h
+#usr/include/asm/param.h
+#usr/include/asm/poll.h
+#usr/include/asm/posix_types.h
+#usr/include/asm/posix_types_32.h
+#usr/include/asm/posix_types_64.h
+#usr/include/asm/prctl.h
+#usr/include/asm/processor-flags.h
+#usr/include/asm/ptrace-abi.h
+#usr/include/asm/ptrace.h
+#usr/include/asm/resource.h
+#usr/include/asm/sembuf.h
+#usr/include/asm/setup.h
+#usr/include/asm/shmbuf.h
+#usr/include/asm/sigcontext.h
+#usr/include/asm/sigcontext32.h
+#usr/include/asm/siginfo.h
+#usr/include/asm/signal.h
+#usr/include/asm/socket.h
+#usr/include/asm/sockios.h
+#usr/include/asm/stat.h
+#usr/include/asm/statfs.h
+#usr/include/asm/swab.h
+#usr/include/asm/termbits.h
+#usr/include/asm/termios.h
+#usr/include/asm/types.h
+#usr/include/asm/ucontext.h
+#usr/include/asm/unistd.h
+#usr/include/asm/unistd_32.h
+#usr/include/asm/unistd_64.h
+#usr/include/asm/vm86.h
+#usr/include/asm/vsyscall.h
+#usr/include/drm
+#usr/include/drm/drm.h
+#usr/include/drm/drm_mode.h
+#usr/include/drm/drm_sarea.h
+#usr/include/drm/i810_drm.h
+#usr/include/drm/i915_drm.h
+#usr/include/drm/mga_drm.h
+#usr/include/drm/nouveau_drm.h
+#usr/include/drm/r128_drm.h
+#usr/include/drm/radeon_drm.h
+#usr/include/drm/savage_drm.h
+#usr/include/drm/sis_drm.h
+#usr/include/drm/via_drm.h
+#usr/include/drm/vmwgfx_drm.h
+#usr/include/linux
+#usr/include/linux/a.out.h
+#usr/include/linux/acct.h
+#usr/include/linux/adb.h
+#usr/include/linux/adfs_fs.h
+#usr/include/linux/affs_hardblocks.h
+#usr/include/linux/agpgart.h
+#usr/include/linux/aio_abi.h
+#usr/include/linux/apm_bios.h
+#usr/include/linux/arcfb.h
+#usr/include/linux/atalk.h
+#usr/include/linux/atm.h
+#usr/include/linux/atm_eni.h
+#usr/include/linux/atm_he.h
+#usr/include/linux/atm_idt77105.h
+#usr/include/linux/atm_nicstar.h
+#usr/include/linux/atm_tcp.h
+#usr/include/linux/atm_zatm.h
+#usr/include/linux/atmapi.h
+#usr/include/linux/atmarp.h
+#usr/include/linux/atmbr2684.h
+#usr/include/linux/atmclip.h
+#usr/include/linux/atmdev.h
+#usr/include/linux/atmioc.h
+#usr/include/linux/atmlec.h
+#usr/include/linux/atmmpc.h
+#usr/include/linux/atmppp.h
+#usr/include/linux/atmsap.h
+#usr/include/linux/atmsvc.h
+#usr/include/linux/audit.h
+#usr/include/linux/auto_fs.h
+#usr/include/linux/auto_fs4.h
+#usr/include/linux/auxvec.h
+#usr/include/linux/ax25.h
+#usr/include/linux/b1lli.h
+#usr/include/linux/baycom.h
+#usr/include/linux/bfs_fs.h
+#usr/include/linux/binfmts.h
+#usr/include/linux/blk_types.h
+#usr/include/linux/blkpg.h
+#usr/include/linux/blktrace_api.h
+#usr/include/linux/bpqether.h
+#usr/include/linux/bsg.h
+#usr/include/linux/byteorder
+#usr/include/linux/byteorder/big_endian.h
+#usr/include/linux/byteorder/little_endian.h
+#usr/include/linux/caif
+#usr/include/linux/caif/caif_socket.h
+#usr/include/linux/caif/if_caif.h
+#usr/include/linux/can
+#usr/include/linux/can.h
+#usr/include/linux/can/bcm.h
+#usr/include/linux/can/error.h
+#usr/include/linux/can/gw.h
+#usr/include/linux/can/netlink.h
+#usr/include/linux/can/raw.h
+#usr/include/linux/capability.h
+#usr/include/linux/capi.h
+#usr/include/linux/cciss_defs.h
+#usr/include/linux/cciss_ioctl.h
+#usr/include/linux/cdk.h
+#usr/include/linux/cdrom.h
+#usr/include/linux/cgroupstats.h
+#usr/include/linux/chio.h
+#usr/include/linux/cm4000_cs.h
+#usr/include/linux/cn_proc.h
+#usr/include/linux/coda.h
+#usr/include/linux/coda_psdev.h
+#usr/include/linux/coff.h
+#usr/include/linux/comstats.h
+#usr/include/linux/connector.h
+#usr/include/linux/const.h
+#usr/include/linux/cramfs_fs.h
+#usr/include/linux/cuda.h
+#usr/include/linux/cyclades.h
+#usr/include/linux/cycx_cfm.h
+#usr/include/linux/dcbnl.h
+#usr/include/linux/dccp.h
+#usr/include/linux/dlm.h
+#usr/include/linux/dlm_device.h
+#usr/include/linux/dlm_netlink.h
+#usr/include/linux/dlm_plock.h
+#usr/include/linux/dlmconstants.h
+#usr/include/linux/dm-ioctl.h
+#usr/include/linux/dm-log-userspace.h
+#usr/include/linux/dn.h
+#usr/include/linux/dqblk_xfs.h
+#usr/include/linux/dvb
+#usr/include/linux/dvb/audio.h
+#usr/include/linux/dvb/ca.h
+#usr/include/linux/dvb/dmx.h
+#usr/include/linux/dvb/frontend.h
+#usr/include/linux/dvb/net.h
+#usr/include/linux/dvb/osd.h
+#usr/include/linux/dvb/version.h
+#usr/include/linux/dvb/video.h
+#usr/include/linux/edd.h
+#usr/include/linux/efs_fs_sb.h
+#usr/include/linux/elf-em.h
+#usr/include/linux/elf-fdpic.h
+#usr/include/linux/elf.h
+#usr/include/linux/elfcore.h
+#usr/include/linux/errno.h
+#usr/include/linux/errqueue.h
+#usr/include/linux/ethtool.h
+#usr/include/linux/eventpoll.h
+#usr/include/linux/ext2_fs.h
+#usr/include/linux/fadvise.h
+#usr/include/linux/falloc.h
+#usr/include/linux/fanotify.h
+#usr/include/linux/fb.h
+#usr/include/linux/fcntl.h
+#usr/include/linux/fd.h
+#usr/include/linux/fdreg.h
+#usr/include/linux/fib_rules.h
+#usr/include/linux/fiemap.h
+#usr/include/linux/filter.h
+#usr/include/linux/firewire-cdev.h
+#usr/include/linux/firewire-constants.h
+#usr/include/linux/flat.h
+#usr/include/linux/fs.h
+#usr/include/linux/fsl_hypervisor.h
+#usr/include/linux/fuse.h
+#usr/include/linux/futex.h
+#usr/include/linux/gameport.h
+#usr/include/linux/gen_stats.h
+#usr/include/linux/generic_serial.h
+#usr/include/linux/genetlink.h
+#usr/include/linux/gfs2_ondisk.h
+#usr/include/linux/gigaset_dev.h
+#usr/include/linux/hdlc
+#usr/include/linux/hdlc.h
+#usr/include/linux/hdlc/ioctl.h
+#usr/include/linux/hdlcdrv.h
+#usr/include/linux/hdreg.h
+#usr/include/linux/hid.h
+#usr/include/linux/hiddev.h
+#usr/include/linux/hidraw.h
+#usr/include/linux/hpet.h
+#usr/include/linux/hysdn_if.h
+#usr/include/linux/i2c-dev.h
+#usr/include/linux/i2c.h
+#usr/include/linux/i2o-dev.h
+#usr/include/linux/i8k.h
+#usr/include/linux/icmp.h
+#usr/include/linux/icmpv6.h
+#usr/include/linux/if.h
+#usr/include/linux/if_addr.h
+#usr/include/linux/if_addrlabel.h
+#usr/include/linux/if_alg.h
+#usr/include/linux/if_arcnet.h
+#usr/include/linux/if_arp.h
+#usr/include/linux/if_bonding.h
+#usr/include/linux/if_bridge.h
+#usr/include/linux/if_cablemodem.h
+#usr/include/linux/if_ec.h
+#usr/include/linux/if_eql.h
+#usr/include/linux/if_ether.h
+#usr/include/linux/if_fc.h
+#usr/include/linux/if_fddi.h
+#usr/include/linux/if_frad.h
+#usr/include/linux/if_hippi.h
+#usr/include/linux/if_infiniband.h
+#usr/include/linux/if_link.h
+#usr/include/linux/if_ltalk.h
+#usr/include/linux/if_packet.h
+#usr/include/linux/if_phonet.h
+#usr/include/linux/if_plip.h
+#usr/include/linux/if_ppp.h
+#usr/include/linux/if_pppol2tp.h
+#usr/include/linux/if_pppox.h
+#usr/include/linux/if_slip.h
+#usr/include/linux/if_strip.h
+#usr/include/linux/if_tr.h
+#usr/include/linux/if_tun.h
+#usr/include/linux/if_tunnel.h
+#usr/include/linux/if_vlan.h
+#usr/include/linux/if_x25.h
+#usr/include/linux/igmp.h
+#usr/include/linux/in.h
+#usr/include/linux/in6.h
+#usr/include/linux/in_route.h
+#usr/include/linux/inet_diag.h
+#usr/include/linux/inotify.h
+#usr/include/linux/input.h
+#usr/include/linux/ioctl.h
+#usr/include/linux/ip.h
+#usr/include/linux/ip6_tunnel.h
+#usr/include/linux/ip_vs.h
+#usr/include/linux/ipc.h
+#usr/include/linux/ipmi.h
+#usr/include/linux/ipmi_msgdefs.h
+#usr/include/linux/ipsec.h
+#usr/include/linux/ipv6.h
+#usr/include/linux/ipv6_route.h
+#usr/include/linux/ipx.h
+#usr/include/linux/irda.h
+#usr/include/linux/irqnr.h
+#usr/include/linux/isdn
+#usr/include/linux/isdn.h
+#usr/include/linux/isdn/capicmd.h
+#usr/include/linux/isdn_divertif.h
+#usr/include/linux/isdn_ppp.h
+#usr/include/linux/isdnif.h
+#usr/include/linux/iso_fs.h
+#usr/include/linux/ivtv.h
+#usr/include/linux/ivtvfb.h
+#usr/include/linux/ixjuser.h
+#usr/include/linux/jffs2.h
+#usr/include/linux/joystick.h
+#usr/include/linux/kd.h
+#usr/include/linux/kdev_t.h
+#usr/include/linux/kernel-page-flags.h
+#usr/include/linux/kernel.h
+#usr/include/linux/kernelcapi.h
+#usr/include/linux/keyboard.h
+#usr/include/linux/keyctl.h
+#usr/include/linux/kvm.h
+#usr/include/linux/kvm_para.h
+#usr/include/linux/l2tp.h
+#usr/include/linux/limits.h
+#usr/include/linux/llc.h
+#usr/include/linux/loop.h
+#usr/include/linux/lp.h
+#usr/include/linux/magic.h
+#usr/include/linux/major.h
+#usr/include/linux/map_to_7segment.h
+#usr/include/linux/matroxfb.h
+#usr/include/linux/media.h
+#usr/include/linux/mempolicy.h
+#usr/include/linux/meye.h
+#usr/include/linux/mii.h
+#usr/include/linux/minix_fs.h
+#usr/include/linux/mman.h
+#usr/include/linux/mmc
+#usr/include/linux/mmc/ioctl.h
+#usr/include/linux/mmtimer.h
+#usr/include/linux/mqueue.h
+#usr/include/linux/mroute.h
+#usr/include/linux/mroute6.h
+#usr/include/linux/msdos_fs.h
+#usr/include/linux/msg.h
+#usr/include/linux/mtio.h
+#usr/include/linux/n_r3964.h
+#usr/include/linux/nbd.h
+#usr/include/linux/ncp.h
+#usr/include/linux/ncp_fs.h
+#usr/include/linux/ncp_mount.h
+#usr/include/linux/ncp_no.h
+#usr/include/linux/neighbour.h
+#usr/include/linux/net.h
+#usr/include/linux/net_dropmon.h
+#usr/include/linux/net_tstamp.h
+#usr/include/linux/netdevice.h
+#usr/include/linux/netfilter
+#usr/include/linux/netfilter.h
+#usr/include/linux/netfilter/ipset
+#usr/include/linux/netfilter/ipset/ip_set.h
+#usr/include/linux/netfilter/ipset/ip_set_bitmap.h
+#usr/include/linux/netfilter/ipset/ip_set_hash.h
+#usr/include/linux/netfilter/ipset/ip_set_list.h
+#usr/include/linux/netfilter/nf_conntrack_common.h
+#usr/include/linux/netfilter/nf_conntrack_ftp.h
+#usr/include/linux/netfilter/nf_conntrack_sctp.h
+#usr/include/linux/netfilter/nf_conntrack_tcp.h
+#usr/include/linux/netfilter/nf_conntrack_tuple_common.h
+#usr/include/linux/netfilter/nfnetlink.h
+#usr/include/linux/netfilter/nfnetlink_compat.h
+#usr/include/linux/netfilter/nfnetlink_conntrack.h
+#usr/include/linux/netfilter/nfnetlink_log.h
+#usr/include/linux/netfilter/nfnetlink_queue.h
+#usr/include/linux/netfilter/x_tables.h
+#usr/include/linux/netfilter/xt_AUDIT.h
+#usr/include/linux/netfilter/xt_CHECKSUM.h
+#usr/include/linux/netfilter/xt_CLASSIFY.h
+#usr/include/linux/netfilter/xt_CONNMARK.h
+#usr/include/linux/netfilter/xt_CONNSECMARK.h
+#usr/include/linux/netfilter/xt_CT.h
+#usr/include/linux/netfilter/xt_DSCP.h
+#usr/include/linux/netfilter/xt_IDLETIMER.h
+#usr/include/linux/netfilter/xt_LED.h
+#usr/include/linux/netfilter/xt_MARK.h
+#usr/include/linux/netfilter/xt_NFLOG.h
+#usr/include/linux/netfilter/xt_NFQUEUE.h
+#usr/include/linux/netfilter/xt_RATEEST.h
+#usr/include/linux/netfilter/xt_SECMARK.h
+#usr/include/linux/netfilter/xt_TCPMSS.h
+#usr/include/linux/netfilter/xt_TCPOPTSTRIP.h
+#usr/include/linux/netfilter/xt_TEE.h
+#usr/include/linux/netfilter/xt_TPROXY.h
+#usr/include/linux/netfilter/xt_addrtype.h
+#usr/include/linux/netfilter/xt_cluster.h
+#usr/include/linux/netfilter/xt_comment.h
+#usr/include/linux/netfilter/xt_connbytes.h
+#usr/include/linux/netfilter/xt_connlimit.h
+#usr/include/linux/netfilter/xt_connmark.h
+#usr/include/linux/netfilter/xt_conntrack.h
+#usr/include/linux/netfilter/xt_cpu.h
+#usr/include/linux/netfilter/xt_dccp.h
+#usr/include/linux/netfilter/xt_devgroup.h
+#usr/include/linux/netfilter/xt_dscp.h
+#usr/include/linux/netfilter/xt_esp.h
+#usr/include/linux/netfilter/xt_hashlimit.h
+#usr/include/linux/netfilter/xt_helper.h
+#usr/include/linux/netfilter/xt_iprange.h
+#usr/include/linux/netfilter/xt_ipvs.h
+#usr/include/linux/netfilter/xt_length.h
+#usr/include/linux/netfilter/xt_limit.h
+#usr/include/linux/netfilter/xt_mac.h
+#usr/include/linux/netfilter/xt_mark.h
+#usr/include/linux/netfilter/xt_multiport.h
+#usr/include/linux/netfilter/xt_osf.h
+#usr/include/linux/netfilter/xt_owner.h
+#usr/include/linux/netfilter/xt_physdev.h
+#usr/include/linux/netfilter/xt_pkttype.h
+#usr/include/linux/netfilter/xt_policy.h
+#usr/include/linux/netfilter/xt_quota.h
+#usr/include/linux/netfilter/xt_rateest.h
+#usr/include/linux/netfilter/xt_realm.h
+#usr/include/linux/netfilter/xt_recent.h
+#usr/include/linux/netfilter/xt_sctp.h
+#usr/include/linux/netfilter/xt_set.h
+#usr/include/linux/netfilter/xt_socket.h
+#usr/include/linux/netfilter/xt_state.h
+#usr/include/linux/netfilter/xt_statistic.h
+#usr/include/linux/netfilter/xt_string.h
+#usr/include/linux/netfilter/xt_tcpmss.h
+#usr/include/linux/netfilter/xt_tcpudp.h
+#usr/include/linux/netfilter/xt_time.h
+#usr/include/linux/netfilter/xt_u32.h
+#usr/include/linux/netfilter_arp
+#usr/include/linux/netfilter_arp.h
+#usr/include/linux/netfilter_arp/arp_tables.h
+#usr/include/linux/netfilter_arp/arpt_mangle.h
+#usr/include/linux/netfilter_bridge
+#usr/include/linux/netfilter_bridge.h
+#usr/include/linux/netfilter_bridge/ebt_802_3.h
+#usr/include/linux/netfilter_bridge/ebt_among.h
+#usr/include/linux/netfilter_bridge/ebt_arp.h
+#usr/include/linux/netfilter_bridge/ebt_arpreply.h
+#usr/include/linux/netfilter_bridge/ebt_ip.h
+#usr/include/linux/netfilter_bridge/ebt_ip6.h
+#usr/include/linux/netfilter_bridge/ebt_limit.h
+#usr/include/linux/netfilter_bridge/ebt_log.h
+#usr/include/linux/netfilter_bridge/ebt_mark_m.h
+#usr/include/linux/netfilter_bridge/ebt_mark_t.h
+#usr/include/linux/netfilter_bridge/ebt_nat.h
+#usr/include/linux/netfilter_bridge/ebt_nflog.h
+#usr/include/linux/netfilter_bridge/ebt_pkttype.h
+#usr/include/linux/netfilter_bridge/ebt_redirect.h
+#usr/include/linux/netfilter_bridge/ebt_stp.h
+#usr/include/linux/netfilter_bridge/ebt_ulog.h
+#usr/include/linux/netfilter_bridge/ebt_vlan.h
+#usr/include/linux/netfilter_bridge/ebtables.h
+#usr/include/linux/netfilter_decnet.h
+#usr/include/linux/netfilter_ipv4
+#usr/include/linux/netfilter_ipv4.h
+#usr/include/linux/netfilter_ipv4/ip_queue.h
+#usr/include/linux/netfilter_ipv4/ip_tables.h
+#usr/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h
+#usr/include/linux/netfilter_ipv4/ipt_ECN.h
+#usr/include/linux/netfilter_ipv4/ipt_LOG.h
+#usr/include/linux/netfilter_ipv4/ipt_REJECT.h
+#usr/include/linux/netfilter_ipv4/ipt_SAME.h
+#usr/include/linux/netfilter_ipv4/ipt_TTL.h
+#usr/include/linux/netfilter_ipv4/ipt_ULOG.h
+#usr/include/linux/netfilter_ipv4/ipt_addrtype.h
+#usr/include/linux/netfilter_ipv4/ipt_ah.h
+#usr/include/linux/netfilter_ipv4/ipt_ecn.h
+#usr/include/linux/netfilter_ipv4/ipt_realm.h
+#usr/include/linux/netfilter_ipv4/ipt_ttl.h
+#usr/include/linux/netfilter_ipv4/nf_nat.h
+#usr/include/linux/netfilter_ipv6
+#usr/include/linux/netfilter_ipv6.h
+#usr/include/linux/netfilter_ipv6/ip6_tables.h
+#usr/include/linux/netfilter_ipv6/ip6t_HL.h
+#usr/include/linux/netfilter_ipv6/ip6t_LOG.h
+#usr/include/linux/netfilter_ipv6/ip6t_REJECT.h
+#usr/include/linux/netfilter_ipv6/ip6t_ah.h
+#usr/include/linux/netfilter_ipv6/ip6t_frag.h
+#usr/include/linux/netfilter_ipv6/ip6t_hl.h
+#usr/include/linux/netfilter_ipv6/ip6t_ipv6header.h
+#usr/include/linux/netfilter_ipv6/ip6t_mh.h
+#usr/include/linux/netfilter_ipv6/ip6t_opts.h
+#usr/include/linux/netfilter_ipv6/ip6t_rt.h
+#usr/include/linux/netlink.h
+#usr/include/linux/netrom.h
+#usr/include/linux/nfc.h
+#usr/include/linux/nfs.h
+#usr/include/linux/nfs2.h
+#usr/include/linux/nfs3.h
+#usr/include/linux/nfs4.h
+#usr/include/linux/nfs4_mount.h
+#usr/include/linux/nfs_fs.h
+#usr/include/linux/nfs_idmap.h
+#usr/include/linux/nfs_mount.h
+#usr/include/linux/nfsacl.h
+#usr/include/linux/nfsd
+#usr/include/linux/nfsd/debug.h
+#usr/include/linux/nfsd/export.h
+#usr/include/linux/nfsd/nfsfh.h
+#usr/include/linux/nfsd/stats.h
+#usr/include/linux/nl80211.h
+#usr/include/linux/nubus.h
+#usr/include/linux/nvram.h
+#usr/include/linux/omap3isp.h
+#usr/include/linux/omapfb.h
+#usr/include/linux/oom.h
+#usr/include/linux/param.h
+#usr/include/linux/parport.h
+#usr/include/linux/patchkey.h
+#usr/include/linux/pci.h
+#usr/include/linux/pci_regs.h
+#usr/include/linux/perf_event.h
+#usr/include/linux/personality.h
+#usr/include/linux/pfkeyv2.h
+#usr/include/linux/pg.h
+#usr/include/linux/phantom.h
+#usr/include/linux/phonet.h
+#usr/include/linux/pkt_cls.h
+#usr/include/linux/pkt_sched.h
+#usr/include/linux/pktcdvd.h
+#usr/include/linux/pmu.h
+#usr/include/linux/poll.h
+#usr/include/linux/posix_types.h
+#usr/include/linux/ppdev.h
+#usr/include/linux/ppp-comp.h
+#usr/include/linux/ppp_defs.h
+#usr/include/linux/pps.h
+#usr/include/linux/prctl.h
+#usr/include/linux/ptp_clock.h
+#usr/include/linux/ptrace.h
+#usr/include/linux/qnx4_fs.h
+#usr/include/linux/qnxtypes.h
+#usr/include/linux/quota.h
+#usr/include/linux/radeonfb.h
+#usr/include/linux/raid
+#usr/include/linux/raid/md_p.h
+#usr/include/linux/raid/md_u.h
+#usr/include/linux/random.h
+#usr/include/linux/raw.h
+#usr/include/linux/rds.h
+#usr/include/linux/reboot.h
+#usr/include/linux/reiserfs_fs.h
+#usr/include/linux/reiserfs_xattr.h
+#usr/include/linux/resource.h
+#usr/include/linux/rfkill.h
+#usr/include/linux/romfs_fs.h
+#usr/include/linux/rose.h
+#usr/include/linux/route.h
+#usr/include/linux/rtc.h
+#usr/include/linux/rtnetlink.h
+#usr/include/linux/scc.h
+#usr/include/linux/sched.h
+#usr/include/linux/screen_info.h
+#usr/include/linux/sdla.h
+#usr/include/linux/securebits.h
+#usr/include/linux/selinux_netlink.h
+#usr/include/linux/sem.h
+#usr/include/linux/serial.h
+#usr/include/linux/serial_core.h
+#usr/include/linux/serial_reg.h
+#usr/include/linux/serio.h
+#usr/include/linux/shm.h
+#usr/include/linux/signal.h
+#usr/include/linux/signalfd.h
+#usr/include/linux/snmp.h
+#usr/include/linux/socket.h
+#usr/include/linux/sockios.h
+#usr/include/linux/som.h
+#usr/include/linux/sonet.h
+#usr/include/linux/sonypi.h
+#usr/include/linux/sound.h
+#usr/include/linux/soundcard.h
+#usr/include/linux/spi
+#usr/include/linux/spi/spidev.h
+#usr/include/linux/stat.h
+#usr/include/linux/stddef.h
+#usr/include/linux/string.h
+#usr/include/linux/sunrpc
+#usr/include/linux/sunrpc/debug.h
+#usr/include/linux/suspend_ioctls.h
+#usr/include/linux/swab.h
+#usr/include/linux/synclink.h
+#usr/include/linux/sysctl.h
+#usr/include/linux/taskstats.h
+#usr/include/linux/tc_act
+#usr/include/linux/tc_act/tc_csum.h
+#usr/include/linux/tc_act/tc_gact.h
+#usr/include/linux/tc_act/tc_ipt.h
+#usr/include/linux/tc_act/tc_mirred.h
+#usr/include/linux/tc_act/tc_nat.h
+#usr/include/linux/tc_act/tc_pedit.h
+#usr/include/linux/tc_act/tc_skbedit.h
+#usr/include/linux/tc_ematch
+#usr/include/linux/tc_ematch/tc_em_cmp.h
+#usr/include/linux/tc_ematch/tc_em_meta.h
+#usr/include/linux/tc_ematch/tc_em_nbyte.h
+#usr/include/linux/tc_ematch/tc_em_text.h
+#usr/include/linux/tcp.h
+#usr/include/linux/telephony.h
+#usr/include/linux/termios.h
+#usr/include/linux/time.h
+#usr/include/linux/times.h
+#usr/include/linux/timex.h
+#usr/include/linux/tiocl.h
+#usr/include/linux/tipc.h
+#usr/include/linux/tipc_config.h
+#usr/include/linux/toshiba.h
+#usr/include/linux/tty.h
+#usr/include/linux/types.h
+#usr/include/linux/udf_fs_i.h
+#usr/include/linux/udp.h
+#usr/include/linux/uinput.h
+#usr/include/linux/uio.h
+#usr/include/linux/ultrasound.h
+#usr/include/linux/un.h
+#usr/include/linux/unistd.h
+#usr/include/linux/usb
+#usr/include/linux/usb/audio.h
+#usr/include/linux/usb/cdc.h
+#usr/include/linux/usb/ch11.h
+#usr/include/linux/usb/ch9.h
+#usr/include/linux/usb/functionfs.h
+#usr/include/linux/usb/g_printer.h
+#usr/include/linux/usb/gadgetfs.h
+#usr/include/linux/usb/midi.h
+#usr/include/linux/usb/tmc.h
+#usr/include/linux/usb/video.h
+#usr/include/linux/usbdevice_fs.h
+#usr/include/linux/utime.h
+#usr/include/linux/utsname.h
+#usr/include/linux/uvcvideo.h
+#usr/include/linux/v4l2-mediabus.h
+#usr/include/linux/v4l2-subdev.h
+#usr/include/linux/version.h
+#usr/include/linux/veth.h
+#usr/include/linux/vhost.h
+#usr/include/linux/videodev2.h
+#usr/include/linux/virtio_9p.h
+#usr/include/linux/virtio_balloon.h
+#usr/include/linux/virtio_blk.h
+#usr/include/linux/virtio_config.h
+#usr/include/linux/virtio_console.h
+#usr/include/linux/virtio_ids.h
+#usr/include/linux/virtio_net.h
+#usr/include/linux/virtio_pci.h
+#usr/include/linux/virtio_ring.h
+#usr/include/linux/virtio_rng.h
+#usr/include/linux/vt.h
+#usr/include/linux/wait.h
+#usr/include/linux/wanrouter.h
+#usr/include/linux/watchdog.h
+#usr/include/linux/wimax
+#usr/include/linux/wimax.h
+#usr/include/linux/wimax/i2400m.h
+#usr/include/linux/wireless.h
+#usr/include/linux/x25.h
+#usr/include/linux/xattr.h
+#usr/include/linux/xfrm.h
+#usr/include/mtd
+#usr/include/mtd/inftl-user.h
+#usr/include/mtd/mtd-abi.h
+#usr/include/mtd/mtd-user.h
+#usr/include/mtd/nftl-user.h
+#usr/include/mtd/ubi-user.h
+#usr/include/rdma
+#usr/include/rdma/ib_user_cm.h
+#usr/include/rdma/ib_user_mad.h
+#usr/include/rdma/ib_user_sa.h
+#usr/include/rdma/ib_user_verbs.h
+#usr/include/rdma/rdma_netlink.h
+#usr/include/rdma/rdma_user_cm.h
+#usr/include/scsi
+#usr/include/scsi/fc
+#usr/include/scsi/fc/fc_els.h
+#usr/include/scsi/fc/fc_fs.h
+#usr/include/scsi/fc/fc_gs.h
+#usr/include/scsi/fc/fc_ns.h
+#usr/include/scsi/scsi_bsg_fc.h
+#usr/include/scsi/scsi_netlink.h
+#usr/include/scsi/scsi_netlink_fc.h
+#usr/include/sound
+#usr/include/sound/asequencer.h
+#usr/include/sound/asound.h
+#usr/include/sound/asound_fm.h
+#usr/include/sound/emu10k1.h
+#usr/include/sound/hdsp.h
+#usr/include/sound/hdspm.h
+#usr/include/sound/sb16_csp.h
+#usr/include/sound/sfnt_info.h
+#usr/include/video
+#usr/include/video/edid.h
+#usr/include/video/sisfb.h
+#usr/include/video/uvesafb.h
+#usr/include/xen
+#usr/include/xen/evtchn.h
+#usr/include/xen/privcmd.h
diff --git a/config/rootfiles/common/i586/linux2 b/config/rootfiles/common/i586/linux2
deleted file mode 100644
index dac70a6..0000000
--- a/config/rootfiles/common/i586/linux2
+++ /dev/null
@@ -1,653 +0,0 @@
-#usr/include/asm
-#usr/include/asm-generic
-#usr/include/asm-generic/auxvec.h
-#usr/include/asm-generic/bitsperlong.h
-#usr/include/asm-generic/errno-base.h
-#usr/include/asm-generic/errno.h
-#usr/include/asm-generic/fcntl.h
-#usr/include/asm-generic/int-l64.h
-#usr/include/asm-generic/int-ll64.h
-#usr/include/asm-generic/ioctl.h
-#usr/include/asm-generic/ioctls.h
-#usr/include/asm-generic/ipcbuf.h
-#usr/include/asm-generic/mman-common.h
-#usr/include/asm-generic/mman.h
-#usr/include/asm-generic/msgbuf.h
-#usr/include/asm-generic/param.h
-#usr/include/asm-generic/poll.h
-#usr/include/asm-generic/posix_types.h
-#usr/include/asm-generic/resource.h
-#usr/include/asm-generic/sembuf.h
-#usr/include/asm-generic/setup.h
-#usr/include/asm-generic/shmbuf.h
-#usr/include/asm-generic/shmparam.h
-#usr/include/asm-generic/siginfo.h
-#usr/include/asm-generic/signal-defs.h
-#usr/include/asm-generic/signal.h
-#usr/include/asm-generic/socket.h
-#usr/include/asm-generic/sockios.h
-#usr/include/asm-generic/stat.h
-#usr/include/asm-generic/statfs.h
-#usr/include/asm-generic/swab.h
-#usr/include/asm-generic/termbits.h
-#usr/include/asm-generic/termios.h
-#usr/include/asm-generic/types.h
-#usr/include/asm-generic/ucontext.h
-#usr/include/asm-generic/unistd.h
-#usr/include/asm/a.out.h
-#usr/include/asm/auxvec.h
-#usr/include/asm/bitsperlong.h
-#usr/include/asm/boot.h
-#usr/include/asm/bootparam.h
-#usr/include/asm/byteorder.h
-#usr/include/asm/debugreg.h
-#usr/include/asm/e820.h
-#usr/include/asm/errno.h
-#usr/include/asm/fcntl.h
-#usr/include/asm/ioctl.h
-#usr/include/asm/ioctls.h
-#usr/include/asm/ipcbuf.h
-#usr/include/asm/ist.h
-#usr/include/asm/kvm.h
-#usr/include/asm/kvm_para.h
-#usr/include/asm/ldt.h
-#usr/include/asm/mce.h
-#usr/include/asm/mman.h
-#usr/include/asm/msgbuf.h
-#usr/include/asm/msr-index.h
-#usr/include/asm/msr.h
-#usr/include/asm/mtrr.h
-#usr/include/asm/param.h
-#usr/include/asm/poll.h
-#usr/include/asm/posix_types.h
-#usr/include/asm/posix_types_32.h
-#usr/include/asm/posix_types_64.h
-#usr/include/asm/prctl.h
-#usr/include/asm/processor-flags.h
-#usr/include/asm/ptrace-abi.h
-#usr/include/asm/ptrace.h
-#usr/include/asm/resource.h
-#usr/include/asm/sembuf.h
-#usr/include/asm/setup.h
-#usr/include/asm/shmbuf.h
-#usr/include/asm/sigcontext.h
-#usr/include/asm/sigcontext32.h
-#usr/include/asm/siginfo.h
-#usr/include/asm/signal.h
-#usr/include/asm/socket.h
-#usr/include/asm/sockios.h
-#usr/include/asm/stat.h
-#usr/include/asm/statfs.h
-#usr/include/asm/swab.h
-#usr/include/asm/termbits.h
-#usr/include/asm/termios.h
-#usr/include/asm/types.h
-#usr/include/asm/ucontext.h
-#usr/include/asm/unistd.h
-#usr/include/asm/unistd_32.h
-#usr/include/asm/unistd_64.h
-#usr/include/asm/vm86.h
-#usr/include/asm/vsyscall.h
-#usr/include/drm
-#usr/include/drm/drm.h
-#usr/include/drm/drm_mode.h
-#usr/include/drm/drm_sarea.h
-#usr/include/drm/i810_drm.h
-#usr/include/drm/i830_drm.h
-#usr/include/drm/i915_drm.h
-#usr/include/drm/mga_drm.h
-#usr/include/drm/r128_drm.h
-#usr/include/drm/radeon_drm.h
-#usr/include/drm/savage_drm.h
-#usr/include/drm/sis_drm.h
-#usr/include/drm/via_drm.h
-#usr/include/linux
-#usr/include/linux/a.out.h
-#usr/include/linux/acct.h
-#usr/include/linux/adb.h
-#usr/include/linux/adfs_fs.h
-#usr/include/linux/affs_hardblocks.h
-#usr/include/linux/agpgart.h
-#usr/include/linux/aio_abi.h
-#usr/include/linux/apm_bios.h
-#usr/include/linux/arcfb.h
-#usr/include/linux/atalk.h
-#usr/include/linux/atm.h
-#usr/include/linux/atm_eni.h
-#usr/include/linux/atm_he.h
-#usr/include/linux/atm_idt77105.h
-#usr/include/linux/atm_nicstar.h
-#usr/include/linux/atm_tcp.h
-#usr/include/linux/atm_zatm.h
-#usr/include/linux/atmapi.h
-#usr/include/linux/atmarp.h
-#usr/include/linux/atmbr2684.h
-#usr/include/linux/atmclip.h
-#usr/include/linux/atmdev.h
-#usr/include/linux/atmioc.h
-#usr/include/linux/atmlec.h
-#usr/include/linux/atmmpc.h
-#usr/include/linux/atmppp.h
-#usr/include/linux/atmsap.h
-#usr/include/linux/atmsvc.h
-#usr/include/linux/audit.h
-#usr/include/linux/auto_fs.h
-#usr/include/linux/auto_fs4.h
-#usr/include/linux/auxvec.h
-#usr/include/linux/ax25.h
-#usr/include/linux/b1lli.h
-#usr/include/linux/baycom.h
-#usr/include/linux/bfs_fs.h
-#usr/include/linux/binfmts.h
-#usr/include/linux/blkpg.h
-#usr/include/linux/blktrace_api.h
-#usr/include/linux/bpqether.h
-#usr/include/linux/bsg.h
-#usr/include/linux/byteorder
-#usr/include/linux/byteorder/big_endian.h
-#usr/include/linux/byteorder/little_endian.h
-#usr/include/linux/can
-#usr/include/linux/can.h
-#usr/include/linux/can/bcm.h
-#usr/include/linux/can/error.h
-#usr/include/linux/can/netlink.h
-#usr/include/linux/can/raw.h
-#usr/include/linux/capability.h
-#usr/include/linux/capi.h
-#usr/include/linux/cciss_ioctl.h
-#usr/include/linux/cdk.h
-#usr/include/linux/cdrom.h
-#usr/include/linux/cgroupstats.h
-#usr/include/linux/chio.h
-#usr/include/linux/cm4000_cs.h
-#usr/include/linux/cn_proc.h
-#usr/include/linux/coda.h
-#usr/include/linux/coda_psdev.h
-#usr/include/linux/coff.h
-#usr/include/linux/comstats.h
-#usr/include/linux/connector.h
-#usr/include/linux/const.h
-#usr/include/linux/cramfs_fs.h
-#usr/include/linux/cuda.h
-#usr/include/linux/cyclades.h
-#usr/include/linux/cycx_cfm.h
-#usr/include/linux/dcbnl.h
-#usr/include/linux/dccp.h
-#usr/include/linux/dlm.h
-#usr/include/linux/dlm_device.h
-#usr/include/linux/dlm_netlink.h
-#usr/include/linux/dlm_plock.h
-#usr/include/linux/dlmconstants.h
-#usr/include/linux/dm-ioctl.h
-#usr/include/linux/dm-log-userspace.h
-#usr/include/linux/dn.h
-#usr/include/linux/dqblk_xfs.h
-#usr/include/linux/dvb
-#usr/include/linux/dvb/audio.h
-#usr/include/linux/dvb/ca.h
-#usr/include/linux/dvb/dmx.h
-#usr/include/linux/dvb/frontend.h
-#usr/include/linux/dvb/net.h
-#usr/include/linux/dvb/osd.h
-#usr/include/linux/dvb/version.h
-#usr/include/linux/dvb/video.h
-#usr/include/linux/edd.h
-#usr/include/linux/efs_fs_sb.h
-#usr/include/linux/elf-em.h
-#usr/include/linux/elf-fdpic.h
-#usr/include/linux/elf.h
-#usr/include/linux/elfcore.h
-#usr/include/linux/errno.h
-#usr/include/linux/errqueue.h
-#usr/include/linux/ethtool.h
-#usr/include/linux/eventpoll.h
-#usr/include/linux/ext2_fs.h
-#usr/include/linux/fadvise.h
-#usr/include/linux/falloc.h
-#usr/include/linux/fb.h
-#usr/include/linux/fcntl.h
-#usr/include/linux/fd.h
-#usr/include/linux/fdreg.h
-#usr/include/linux/fib_rules.h
-#usr/include/linux/fiemap.h
-#usr/include/linux/filter.h
-#usr/include/linux/firewire-cdev.h
-#usr/include/linux/firewire-constants.h
-#usr/include/linux/flat.h
-#usr/include/linux/fs.h
-#usr/include/linux/fuse.h
-#usr/include/linux/futex.h
-#usr/include/linux/gameport.h
-#usr/include/linux/gen_stats.h
-#usr/include/linux/generic_serial.h
-#usr/include/linux/genetlink.h
-#usr/include/linux/gfs2_ondisk.h
-#usr/include/linux/gigaset_dev.h
-#usr/include/linux/hayesesp.h
-#usr/include/linux/hdlc
-#usr/include/linux/hdlc.h
-#usr/include/linux/hdlc/ioctl.h
-#usr/include/linux/hdlcdrv.h
-#usr/include/linux/hdreg.h
-#usr/include/linux/hid.h
-#usr/include/linux/hiddev.h
-#usr/include/linux/hidraw.h
-#usr/include/linux/hpet.h
-#usr/include/linux/hysdn_if.h
-#usr/include/linux/i2c-dev.h
-#usr/include/linux/i2c.h
-#usr/include/linux/i2o-dev.h
-#usr/include/linux/i8k.h
-#usr/include/linux/icmp.h
-#usr/include/linux/icmpv6.h
-#usr/include/linux/if.h
-#usr/include/linux/if_addr.h
-#usr/include/linux/if_addrlabel.h
-#usr/include/linux/if_arcnet.h
-#usr/include/linux/if_arp.h
-#usr/include/linux/if_bonding.h
-#usr/include/linux/if_bridge.h
-#usr/include/linux/if_cablemodem.h
-#usr/include/linux/if_ec.h
-#usr/include/linux/if_eql.h
-#usr/include/linux/if_ether.h
-#usr/include/linux/if_fc.h
-#usr/include/linux/if_fddi.h
-#usr/include/linux/if_frad.h
-#usr/include/linux/if_hippi.h
-#usr/include/linux/if_infiniband.h
-#usr/include/linux/if_link.h
-#usr/include/linux/if_ltalk.h
-#usr/include/linux/if_packet.h
-#usr/include/linux/if_phonet.h
-#usr/include/linux/if_plip.h
-#usr/include/linux/if_ppp.h
-#usr/include/linux/if_pppol2tp.h
-#usr/include/linux/if_pppox.h
-#usr/include/linux/if_slip.h
-#usr/include/linux/if_strip.h
-#usr/include/linux/if_tr.h
-#usr/include/linux/if_tun.h
-#usr/include/linux/if_tunnel.h
-#usr/include/linux/if_vlan.h
-#usr/include/linux/igmp.h
-#usr/include/linux/in.h
-#usr/include/linux/in6.h
-#usr/include/linux/in_route.h
-#usr/include/linux/inet_diag.h
-#usr/include/linux/inotify.h
-#usr/include/linux/input.h
-#usr/include/linux/ioctl.h
-#usr/include/linux/ip.h
-#usr/include/linux/ip6_tunnel.h
-#usr/include/linux/ip_vs.h
-#usr/include/linux/ipc.h
-#usr/include/linux/ipmi.h
-#usr/include/linux/ipmi_msgdefs.h
-#usr/include/linux/ipsec.h
-#usr/include/linux/ipv6.h
-#usr/include/linux/ipv6_route.h
-#usr/include/linux/ipx.h
-#usr/include/linux/irda.h
-#usr/include/linux/irqnr.h
-#usr/include/linux/isdn
-#usr/include/linux/isdn.h
-#usr/include/linux/isdn/capicmd.h
-#usr/include/linux/isdn_divertif.h
-#usr/include/linux/isdn_ppp.h
-#usr/include/linux/isdnif.h
-#usr/include/linux/iso_fs.h
-#usr/include/linux/ivtv.h
-#usr/include/linux/ivtvfb.h
-#usr/include/linux/ixjuser.h
-#usr/include/linux/jffs2.h
-#usr/include/linux/joystick.h
-#usr/include/linux/kd.h
-#usr/include/linux/kdev_t.h
-#usr/include/linux/kernel.h
-#usr/include/linux/kernelcapi.h
-#usr/include/linux/keyboard.h
-#usr/include/linux/keyctl.h
-#usr/include/linux/kvm.h
-#usr/include/linux/kvm_para.h
-#usr/include/linux/limits.h
-#usr/include/linux/llc.h
-#usr/include/linux/loop.h
-#usr/include/linux/lp.h
-#usr/include/linux/magic.h
-#usr/include/linux/major.h
-#usr/include/linux/map_to_7segment.h
-#usr/include/linux/matroxfb.h
-#usr/include/linux/mempolicy.h
-#usr/include/linux/meye.h
-#usr/include/linux/mii.h
-#usr/include/linux/minix_fs.h
-#usr/include/linux/mman.h
-#usr/include/linux/mmtimer.h
-#usr/include/linux/mqueue.h
-#usr/include/linux/mroute.h
-#usr/include/linux/mroute6.h
-#usr/include/linux/msdos_fs.h
-#usr/include/linux/msg.h
-#usr/include/linux/mtio.h
-#usr/include/linux/n_r3964.h
-#usr/include/linux/nbd.h
-#usr/include/linux/ncp.h
-#usr/include/linux/ncp_fs.h
-#usr/include/linux/ncp_mount.h
-#usr/include/linux/ncp_no.h
-#usr/include/linux/neighbour.h
-#usr/include/linux/net.h
-#usr/include/linux/net_dropmon.h
-#usr/include/linux/netdevice.h
-#usr/include/linux/netfilter
-#usr/include/linux/netfilter.h
-#usr/include/linux/netfilter/nf_conntrack_common.h
-#usr/include/linux/netfilter/nf_conntrack_ftp.h
-#usr/include/linux/netfilter/nf_conntrack_sctp.h
-#usr/include/linux/netfilter/nf_conntrack_tcp.h
-#usr/include/linux/netfilter/nf_conntrack_tuple_common.h
-#usr/include/linux/netfilter/nfnetlink.h
-#usr/include/linux/netfilter/nfnetlink_compat.h
-#usr/include/linux/netfilter/nfnetlink_conntrack.h
-#usr/include/linux/netfilter/nfnetlink_log.h
-#usr/include/linux/netfilter/nfnetlink_queue.h
-#usr/include/linux/netfilter/x_tables.h
-#usr/include/linux/netfilter/xt_CLASSIFY.h
-#usr/include/linux/netfilter/xt_CONNMARK.h
-#usr/include/linux/netfilter/xt_CONNSECMARK.h
-#usr/include/linux/netfilter/xt_DSCP.h
-#usr/include/linux/netfilter/xt_LED.h
-#usr/include/linux/netfilter/xt_MARK.h
-#usr/include/linux/netfilter/xt_NFLOG.h
-#usr/include/linux/netfilter/xt_NFQUEUE.h
-#usr/include/linux/netfilter/xt_RATEEST.h
-#usr/include/linux/netfilter/xt_SECMARK.h
-#usr/include/linux/netfilter/xt_TCPMSS.h
-#usr/include/linux/netfilter/xt_TCPOPTSTRIP.h
-#usr/include/linux/netfilter/xt_TPROXY.h
-#usr/include/linux/netfilter/xt_cluster.h
-#usr/include/linux/netfilter/xt_comment.h
-#usr/include/linux/netfilter/xt_connbytes.h
-#usr/include/linux/netfilter/xt_connlimit.h
-#usr/include/linux/netfilter/xt_connmark.h
-#usr/include/linux/netfilter/xt_conntrack.h
-#usr/include/linux/netfilter/xt_dccp.h
-#usr/include/linux/netfilter/xt_dscp.h
-#usr/include/linux/netfilter/xt_esp.h
-#usr/include/linux/netfilter/xt_hashlimit.h
-#usr/include/linux/netfilter/xt_helper.h
-#usr/include/linux/netfilter/xt_iprange.h
-#usr/include/linux/netfilter/xt_length.h
-#usr/include/linux/netfilter/xt_limit.h
-#usr/include/linux/netfilter/xt_mac.h
-#usr/include/linux/netfilter/xt_mark.h
-#usr/include/linux/netfilter/xt_multiport.h
-#usr/include/linux/netfilter/xt_osf.h
-#usr/include/linux/netfilter/xt_owner.h
-#usr/include/linux/netfilter/xt_physdev.h
-#usr/include/linux/netfilter/xt_pkttype.h
-#usr/include/linux/netfilter/xt_policy.h
-#usr/include/linux/netfilter/xt_quota.h
-#usr/include/linux/netfilter/xt_rateest.h
-#usr/include/linux/netfilter/xt_realm.h
-#usr/include/linux/netfilter/xt_recent.h
-#usr/include/linux/netfilter/xt_sctp.h
-#usr/include/linux/netfilter/xt_state.h
-#usr/include/linux/netfilter/xt_statistic.h
-#usr/include/linux/netfilter/xt_string.h
-#usr/include/linux/netfilter/xt_tcpmss.h
-#usr/include/linux/netfilter/xt_tcpudp.h
-#usr/include/linux/netfilter/xt_time.h
-#usr/include/linux/netfilter/xt_u32.h
-#usr/include/linux/netfilter_arp
-#usr/include/linux/netfilter_arp.h
-#usr/include/linux/netfilter_arp/arp_tables.h
-#usr/include/linux/netfilter_arp/arpt_mangle.h
-#usr/include/linux/netfilter_bridge
-#usr/include/linux/netfilter_bridge.h
-#usr/include/linux/netfilter_bridge/ebt_802_3.h
-#usr/include/linux/netfilter_bridge/ebt_among.h
-#usr/include/linux/netfilter_bridge/ebt_arp.h
-#usr/include/linux/netfilter_bridge/ebt_arpreply.h
-#usr/include/linux/netfilter_bridge/ebt_ip.h
-#usr/include/linux/netfilter_bridge/ebt_limit.h
-#usr/include/linux/netfilter_bridge/ebt_log.h
-#usr/include/linux/netfilter_bridge/ebt_mark_m.h
-#usr/include/linux/netfilter_bridge/ebt_mark_t.h
-#usr/include/linux/netfilter_bridge/ebt_nat.h
-#usr/include/linux/netfilter_bridge/ebt_pkttype.h
-#usr/include/linux/netfilter_bridge/ebt_redirect.h
-#usr/include/linux/netfilter_bridge/ebt_stp.h
-#usr/include/linux/netfilter_bridge/ebt_ulog.h
-#usr/include/linux/netfilter_bridge/ebt_vlan.h
-#usr/include/linux/netfilter_bridge/ebtables.h
-#usr/include/linux/netfilter_decnet.h
-#usr/include/linux/netfilter_ipv4
-#usr/include/linux/netfilter_ipv4.h
-#usr/include/linux/netfilter_ipv4/ip_queue.h
-#usr/include/linux/netfilter_ipv4/ip_tables.h
-#usr/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h
-#usr/include/linux/netfilter_ipv4/ipt_ECN.h
-#usr/include/linux/netfilter_ipv4/ipt_LOG.h
-#usr/include/linux/netfilter_ipv4/ipt_REJECT.h
-#usr/include/linux/netfilter_ipv4/ipt_SAME.h
-#usr/include/linux/netfilter_ipv4/ipt_TTL.h
-#usr/include/linux/netfilter_ipv4/ipt_ULOG.h
-#usr/include/linux/netfilter_ipv4/ipt_addrtype.h
-#usr/include/linux/netfilter_ipv4/ipt_ah.h
-#usr/include/linux/netfilter_ipv4/ipt_ecn.h
-#usr/include/linux/netfilter_ipv4/ipt_realm.h
-#usr/include/linux/netfilter_ipv4/ipt_ttl.h
-#usr/include/linux/netfilter_ipv6
-#usr/include/linux/netfilter_ipv6.h
-#usr/include/linux/netfilter_ipv6/ip6_tables.h
-#usr/include/linux/netfilter_ipv6/ip6t_HL.h
-#usr/include/linux/netfilter_ipv6/ip6t_LOG.h
-#usr/include/linux/netfilter_ipv6/ip6t_REJECT.h
-#usr/include/linux/netfilter_ipv6/ip6t_ah.h
-#usr/include/linux/netfilter_ipv6/ip6t_frag.h
-#usr/include/linux/netfilter_ipv6/ip6t_hl.h
-#usr/include/linux/netfilter_ipv6/ip6t_ipv6header.h
-#usr/include/linux/netfilter_ipv6/ip6t_mh.h
-#usr/include/linux/netfilter_ipv6/ip6t_opts.h
-#usr/include/linux/netfilter_ipv6/ip6t_rt.h
-#usr/include/linux/netlink.h
-#usr/include/linux/netrom.h
-#usr/include/linux/nfs.h
-#usr/include/linux/nfs2.h
-#usr/include/linux/nfs3.h
-#usr/include/linux/nfs4.h
-#usr/include/linux/nfs4_mount.h
-#usr/include/linux/nfs_fs.h
-#usr/include/linux/nfs_idmap.h
-#usr/include/linux/nfs_mount.h
-#usr/include/linux/nfsacl.h
-#usr/include/linux/nfsd
-#usr/include/linux/nfsd/const.h
-#usr/include/linux/nfsd/debug.h
-#usr/include/linux/nfsd/export.h
-#usr/include/linux/nfsd/nfsfh.h
-#usr/include/linux/nfsd/stats.h
-#usr/include/linux/nfsd/syscall.h
-#usr/include/linux/nl80211.h
-#usr/include/linux/nubus.h
-#usr/include/linux/nvram.h
-#usr/include/linux/oom.h
-#usr/include/linux/param.h
-#usr/include/linux/parport.h
-#usr/include/linux/patchkey.h
-#usr/include/linux/pci.h
-#usr/include/linux/pci_regs.h
-#usr/include/linux/perf_event.h
-#usr/include/linux/personality.h
-#usr/include/linux/pfkeyv2.h
-#usr/include/linux/pg.h
-#usr/include/linux/phantom.h
-#usr/include/linux/phonet.h
-#usr/include/linux/pkt_cls.h
-#usr/include/linux/pkt_sched.h
-#usr/include/linux/pktcdvd.h
-#usr/include/linux/pmu.h
-#usr/include/linux/poll.h
-#usr/include/linux/posix_types.h
-#usr/include/linux/ppdev.h
-#usr/include/linux/ppp-comp.h
-#usr/include/linux/ppp_defs.h
-#usr/include/linux/pps.h
-#usr/include/linux/prctl.h
-#usr/include/linux/ptrace.h
-#usr/include/linux/qnx4_fs.h
-#usr/include/linux/qnxtypes.h
-#usr/include/linux/quota.h
-#usr/include/linux/radeonfb.h
-#usr/include/linux/raid
-#usr/include/linux/raid/md_p.h
-#usr/include/linux/raid/md_u.h
-#usr/include/linux/random.h
-#usr/include/linux/raw.h
-#usr/include/linux/reboot.h
-#usr/include/linux/reiserfs_fs.h
-#usr/include/linux/reiserfs_xattr.h
-#usr/include/linux/resource.h
-#usr/include/linux/rfkill.h
-#usr/include/linux/romfs_fs.h
-#usr/include/linux/rose.h
-#usr/include/linux/route.h
-#usr/include/linux/rtc.h
-#usr/include/linux/rtnetlink.h
-#usr/include/linux/scc.h
-#usr/include/linux/sched.h
-#usr/include/linux/screen_info.h
-#usr/include/linux/sdla.h
-#usr/include/linux/selinux_netlink.h
-#usr/include/linux/sem.h
-#usr/include/linux/serial.h
-#usr/include/linux/serial_core.h
-#usr/include/linux/serial_reg.h
-#usr/include/linux/serio.h
-#usr/include/linux/shm.h
-#usr/include/linux/signal.h
-#usr/include/linux/signalfd.h
-#usr/include/linux/smb.h
-#usr/include/linux/smb_fs.h
-#usr/include/linux/smb_mount.h
-#usr/include/linux/smbno.h
-#usr/include/linux/snmp.h
-#usr/include/linux/socket.h
-#usr/include/linux/sockios.h
-#usr/include/linux/som.h
-#usr/include/linux/sonet.h
-#usr/include/linux/sonypi.h
-#usr/include/linux/sound.h
-#usr/include/linux/soundcard.h
-#usr/include/linux/spi
-#usr/include/linux/spi/spidev.h
-#usr/include/linux/stat.h
-#usr/include/linux/stddef.h
-#usr/include/linux/string.h
-#usr/include/linux/sunrpc
-#usr/include/linux/sunrpc/debug.h
-#usr/include/linux/suspend_ioctls.h
-#usr/include/linux/swab.h
-#usr/include/linux/synclink.h
-#usr/include/linux/sysctl.h
-#usr/include/linux/taskstats.h
-#usr/include/linux/tc_act
-#usr/include/linux/tc_act/tc_gact.h
-#usr/include/linux/tc_act/tc_ipt.h
-#usr/include/linux/tc_act/tc_mirred.h
-#usr/include/linux/tc_act/tc_nat.h
-#usr/include/linux/tc_act/tc_pedit.h
-#usr/include/linux/tc_act/tc_skbedit.h
-#usr/include/linux/tc_ematch
-#usr/include/linux/tc_ematch/tc_em_cmp.h
-#usr/include/linux/tc_ematch/tc_em_meta.h
-#usr/include/linux/tc_ematch/tc_em_nbyte.h
-#usr/include/linux/tc_ematch/tc_em_text.h
-#usr/include/linux/tcp.h
-#usr/include/linux/telephony.h
-#usr/include/linux/termios.h
-#usr/include/linux/time.h
-#usr/include/linux/times.h
-#usr/include/linux/timex.h
-#usr/include/linux/tiocl.h
-#usr/include/linux/tipc.h
-#usr/include/linux/tipc_config.h
-#usr/include/linux/toshiba.h
-#usr/include/linux/tty.h
-#usr/include/linux/types.h
-#usr/include/linux/udf_fs_i.h
-#usr/include/linux/udp.h
-#usr/include/linux/uinput.h
-#usr/include/linux/uio.h
-#usr/include/linux/ultrasound.h
-#usr/include/linux/un.h
-#usr/include/linux/unistd.h
-#usr/include/linux/usb
-#usr/include/linux/usb/audio.h
-#usr/include/linux/usb/cdc.h
-#usr/include/linux/usb/ch9.h
-#usr/include/linux/usb/g_printer.h
-#usr/include/linux/usb/gadgetfs.h
-#usr/include/linux/usb/midi.h
-#usr/include/linux/usb/tmc.h
-#usr/include/linux/usb/vstusb.h
-#usr/include/linux/usbdevice_fs.h
-#usr/include/linux/utime.h
-#usr/include/linux/utsname.h
-#usr/include/linux/version.h
-#usr/include/linux/veth.h
-#usr/include/linux/videodev.h
-#usr/include/linux/videodev2.h
-#usr/include/linux/videotext.h
-#usr/include/linux/virtio_9p.h
-#usr/include/linux/virtio_balloon.h
-#usr/include/linux/virtio_blk.h
-#usr/include/linux/virtio_config.h
-#usr/include/linux/virtio_console.h
-#usr/include/linux/virtio_ids.h
-#usr/include/linux/virtio_net.h
-#usr/include/linux/virtio_pci.h
-#usr/include/linux/virtio_ring.h
-#usr/include/linux/virtio_rng.h
-#usr/include/linux/vt.h
-#usr/include/linux/wait.h
-#usr/include/linux/wanrouter.h
-#usr/include/linux/watchdog.h
-#usr/include/linux/wimax
-#usr/include/linux/wimax.h
-#usr/include/linux/wimax/i2400m.h
-#usr/include/linux/wireless.h
-#usr/include/linux/x25.h
-#usr/include/linux/xattr.h
-#usr/include/linux/xfrm.h
-#usr/include/mtd
-#usr/include/mtd/inftl-user.h
-#usr/include/mtd/mtd-abi.h
-#usr/include/mtd/mtd-user.h
-#usr/include/mtd/nftl-user.h
-#usr/include/mtd/ubi-user.h
-#usr/include/rdma
-#usr/include/rdma/ib_user_mad.h
-#usr/include/scsi
-#usr/include/scsi/scsi.h
-#usr/include/scsi/scsi_bsg_fc.h
-#usr/include/scsi/scsi_netlink.h
-#usr/include/scsi/scsi_netlink_fc.h
-#usr/include/sound
-#usr/include/sound/asequencer.h
-#usr/include/sound/asound.h
-#usr/include/sound/asound_fm.h
-#usr/include/sound/emu10k1.h
-#usr/include/sound/hdsp.h
-#usr/include/sound/hdspm.h
-#usr/include/sound/sb16_csp.h
-#usr/include/sound/sfnt_info.h
-#usr/include/sound/sscape_ioctl.h
-#usr/include/video
-#usr/include/video/edid.h
-#usr/include/video/sisfb.h
-#usr/include/video/uvesafb.h
-#usr/include/xen
-#usr/include/xen/evtchn.h
diff --git a/config/rootfiles/common/iptables b/config/rootfiles/common/iptables
index af034e8e..d30cbf5 100644
--- a/config/rootfiles/common/iptables
+++ b/config/rootfiles/common/iptables
@@ -149,9 +149,14 @@ sbin/xtables-multi
#usr/include/libnfnetlink/linux_nfnetlink.h
#usr/include/libnfnetlink/linux_nfnetlink_compat.h
#usr/include/linux/netfilter/Kbuild
+#usr/include/linux/netfilter/ipset
#usr/include/linux/netfilter/ipset/Kbuild
+#usr/include/linux/netfilter/ipset/ip_set.h
#usr/include/linux/netfilter/ipset/ip_set_ahash.h
+#usr/include/linux/netfilter/ipset/ip_set_bitmap.h
#usr/include/linux/netfilter/ipset/ip_set_getport.h
+#usr/include/linux/netfilter/ipset/ip_set_hash.h
+#usr/include/linux/netfilter/ipset/ip_set_list.h
#usr/include/linux/netfilter/ipset/ip_set_timeout.h
#usr/include/linux/netfilter/ipset/pfxlen.h
#usr/include/linux/netfilter/nf_conntrack_amanda.h
@@ -166,8 +171,19 @@ sbin/xtables-multi
#usr/include/linux/netfilter/nf_conntrack_sip.h
#usr/include/linux/netfilter/nf_conntrack_snmp.h
#usr/include/linux/netfilter/nf_conntrack_tftp.h
+#usr/include/linux/netfilter/xt_AUDIT.h
+#usr/include/linux/netfilter/xt_CHECKSUM.h
+#usr/include/linux/netfilter/xt_CT.h
+#usr/include/linux/netfilter/xt_IDLETIMER.h
#usr/include/linux/netfilter/xt_IMQ.h
+#usr/include/linux/netfilter/xt_TEE.h
+#usr/include/linux/netfilter/xt_addrtype.h
+#usr/include/linux/netfilter/xt_cpu.h
+#usr/include/linux/netfilter/xt_devgroup.h
+#usr/include/linux/netfilter/xt_ipvs.h
#usr/include/linux/netfilter/xt_layer7.h
+#usr/include/linux/netfilter/xt_set.h
+#usr/include/linux/netfilter/xt_socket.h
#usr/include/net/netfilter
#usr/include/net/netfilter/nf_conntrack_tuple.h
#usr/include/net/netfilter/nf_nat.h
diff --git a/config/rootfiles/packages/w_scan b/config/rootfiles/packages/w_scan
index 40d3546..7e7d50a 100644
--- a/config/rootfiles/packages/w_scan
+++ b/config/rootfiles/packages/w_scan
@@ -1,2 +1,2 @@
-opt/vdr/bin/w_scan
-opt/vdr/bin/w_scan_start
+usr/bin/w_scan
+#usr/share/man/man1/w_scan.1
diff --git a/lfs/compat-wireless b/lfs/compat-wireless
index 4f94fe8..6c6b791 100644
--- a/lfs/compat-wireless
+++ b/lfs/compat-wireless
@@ -26,7 +26,7 @@ include Config
VERSUFIX=ipfire$(KCFG)
-VER = 3.6.2-1-snp
+VER = 3.6.6-1-snp
ifeq "$(KCFG)" "-xen"
KVER = 2.6.32.60
@@ -47,7 +47,7 @@ objects = $(DL_FILE) asix-4.4.0.tar.xz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
asix-4.4.0.tar.xz = $(DL_FROM)/asix-4.4.0.tar.xz
-$(DL_FILE)_MD5 = 3adbfc455f883d297e02cac2d8d2c40f
+$(DL_FILE)_MD5 = e20f1b5a50095cf3483fd171ea9d3f92
asix-4.4.0.tar.xz_MD5=633609e889de41554826e0e2cd7bffde
diff --git a/lfs/initscripts b/lfs/initscripts
index c9ff24e..213b46e 100644
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -203,7 +203,9 @@ $(TARGET) :
ifeq "$(MACHINE_TYPE)" "arm"
rm -vf /etc/rc.d/init.d/{acpid,checkfstab}
else
- ln -sf ../init.d/acpid /etc/rc.d/rcsysinit.d/S51acpid
+ ln -sf ../init.d/acpid /etc/rc.d/rc3.d/S12acpid
+ ln -sf ../init.d/acpid /etc/rc.d/rc0.d/K87acpid
+ ln -sf ../init.d/acpid /etc/rc.d/rc6.d/K87acpid
ln -sf ../init.d/checkfstab /etc/rc.d/rcsysinit.d/S19checkfstab
endif
diff --git a/lfs/linux b/lfs/linux
index 80050cc..dbe0896 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -40,16 +40,12 @@ DEPS = ""
VERSUFIX=ipfire$(KCFG)
-ifeq "$(HEADERS)" "1"
ifeq "$(TOOLS)" "1"
- TARGET = $(DIR_INFO)/linux-libc-headers-$(VER)-$(VERSUFIX)-tools
+ TARGET = $(DIR_INFO)/linux-$(VER)-$(VERSUFIX)-tools
HEADERS_PREFIX = /tools
else
- TARGET = $(DIR_INFO)/linux-libc-headers-$(VER)-$(VERSUFIX)
- HEADERS_PREFIX = /usr
-endif
-else
TARGET = $(DIR_INFO)/linux-$(VER)-$(VERSUFIX)
+ HEADERS_PREFIX = /usr
endif
ifeq "$(MACHINE_TYPE)" "arm"
@@ -151,7 +147,7 @@ ifeq "$(KCFG)" "-rpi"
cd $(DIR_APP) && xzcat $(DIR_DL)/rpi-patches-$(RPI_PATCHES).patch.xz | patch -Np1
endif
-ifeq "$(HEADERS)" "1"
+ifeq "$(KCFG)" "-headers"
# Install the header files
cd $(DIR_APP) && make ARCH=$(HEADERS_ARCH) INSTALL_HDR_PATH=dest headers_install
-mkdir -pv $(BUILDROOT)/$(HEADERS_PREFIX)/include
diff --git a/lfs/motion b/lfs/motion
index d42abaf..fa99ea0 100644
--- a/lfs/motion
+++ b/lfs/motion
@@ -77,11 +77,19 @@ dist:
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+
+ #Install obsolete V4L1 videodev.h
+ cp $(DIR_SRC)/config/include/obsolete_videodev.h /usr/include/linux/videodev.h
+
cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
cp -vf $(DIR_SRC)/config/motion/motion.conf /etc
install -v -m 644 $(DIR_SRC)/config/backup/includes/motion \
/var/ipfire/backup/addons/includes/motion
+
+ #Remove obsolete V4L1 videodev.h
+ rm -f /usr/include/linux/videodev.h
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/vdr b/lfs/vdr
index ca8f0da..46ea5d3 100644
--- a/lfs/vdr
+++ b/lfs/vdr
@@ -89,7 +89,10 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-
+
+ # Install obsolete V4L1 videodev header.
+ cp $(DIR_SRC)/config/include/obsolete_videodev.h /usr/include/linux/videodev.h
+
# Accept also DVB_API_VERSION 5
cd $(DIR_APP) && sed -i -e "s|DVB_API_VERSION != 3|& \&\& DVB_API_VERSION != 5|g" dvbdevice.h
@@ -120,5 +123,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
ln -sf ../init.d/vdr /etc/rc.d/rc6.d/K40vdr
install -v -m 644 $(DIR_SRC)/config/backup/includes/vdr \
/var/ipfire/backup/addons/includes/vdr
+
+ # Remove obsolete V4L1 videodev header.
+ rm -f /usr/include/linux/videodev.h
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/w_scan b/lfs/w_scan
index e58cf50..f6e8b9d 100644
--- a/lfs/w_scan
+++ b/lfs/w_scan
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -25,7 +25,7 @@
include Config
-VER = 20080105
+VER = 20121111
THISAPP = w_scan-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = w_scan
-PAK_VER = 1
+PAK_VER = 2
DEPS = ""
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 9541244559d2da9442a137f7891d45d3
+$(DL_FILE)_MD5 = 30da05747fed9988e11ebc7745f5e71f
install : $(TARGET)
@@ -78,10 +78,8 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch < $(DIR_SRC)/src/patches/w_scan-ipfire.patch
- cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
- -mkdir -pv /opt/vdr/bin
- cd $(DIR_APP) && install -m 755 w_scan /opt/vdr/bin/
- cd $(DIR_APP) && install -m 755 w_scan_start.sh /opt/vdr/bin/w_scan_start
+ cd $(DIR_APP) && ./configure --prefix=/usr
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index b60723d..7cf5945 100755
--- a/make.sh
+++ b/make.sh
@@ -258,7 +258,7 @@ buildtoolchain() {
lfsmake1 ccache PASS=1
lfsmake1 binutils PASS=1
lfsmake1 gcc PASS=1
- lfsmake1 linux2 TOOLS=1 HEADERS=1
+ lfsmake1 linux TOOLS=1 KCFG="-headers"
lfsmake1 glibc
lfsmake1 cleanup-toolchain PASS=1
lfsmake1 binutils PASS=2
@@ -294,7 +294,7 @@ buildbase() {
LOGFILE="$BASEDIR/log/_build.base.log"
export LOGFILE
lfsmake2 stage2
- lfsmake2 linux2 HEADERS=1
+ lfsmake2 linux KCFG="-headers"
lfsmake2 man-pages
lfsmake2 glibc
lfsmake2 tzdata
diff --git a/src/initscripts/init.d/sendsignals b/src/initscripts/init.d/sendsignals
index 1f5e07e..58c16c3 100644
--- a/src/initscripts/init.d/sendsignals
+++ b/src/initscripts/init.d/sendsignals
@@ -23,7 +23,7 @@ case "${1}" in
sleep ${KILLDELAY}
- if [ "${error_value}" = 0 ]; then
+ if [ "${error_value}" = 0 -o "${error_value}" = 2 ]; then
echo_ok
else
echo_failure
@@ -35,7 +35,7 @@ case "${1}" in
sleep ${KILLDELAY}
- if [ "${error_value}" = 0 ]; then
+ if [ "${error_value}" = 0 -o "${error_value}" = 2 ]; then
echo_ok
else
echo_failure
diff --git a/src/patches/w_scan-ipfire.patch b/src/patches/w_scan-ipfire.patch
deleted file mode 100644
index 69ad359..0000000
--- a/src/patches/w_scan-ipfire.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-diff -Naur w_scan_start.sh w_scan_start.sh
---- w_scan_start.sh 2008-01-05 19:58:44.000000000 +0100
-+++ w_scan_start.sh 2008-05-14 18:29:21.000000000 +0200
-@@ -6,11 +6,11 @@
- # - 20060812: first version
- # - 20060822: many improvements
- # cu(a)vdr-portal
--#
-+# - 20080514: patches for ipfire by arne_f(a)ipfire.org
- #######################################################
-
- umask 022
--export PATH="$(pwd):/bin:/usr/bin:/sbin:/usr/sbin"
-+export PATH="$(pwd):/bin:/usr/bin:/sbin:/usr/sbin:/opt/vdr/bin"
- DATE="$(date +%Y)$(date +%m)$(date +%d)" # $DATE == "YYYYMMDD", i.e. 20060710
- W_SCAN=$(which w_scan 2>/dev/null)
- UDEVSTART=$(which udevstart)
-@@ -224,7 +224,7 @@
- echo "Checking for ct-vdr style startscript.."
- if [ -e /etc/init.d/vdr ]; then # c't-vdr
- echo_yes
-- $(/etc/init.d/vdr stop)
-+ /etc/init.d/vdr stop
- stopped=true
- else
- echo_no
-@@ -375,7 +375,7 @@
-
- # which generic dvb modules should be always loaded?
- MODULES_TO_LOAD="videodev v4l1_compat \
-- v4l2_common video_buf dvb_core ves1820 \
-+ v4l2_common dvb_core ves1820 \
- dvb_ttpci \
- budget_ci budget_av budget_ci budget "
-
-@@ -661,9 +661,11 @@
- echo -e -n $NORMAL
- echo -e -n "\\033[1;34m"
- if [ ${WHAT_TO_SCAN:0:2} != 0 ]; then
-+ echo ":->W_SCAN $DATE DVB-T" >> channels.conf-$DATE
- $W_SCAN >> channels.conf-$DATE
- fi
-- if [ ${WHAT_TO_SCAN:3:2} != 0 ]; then
-+ if [ ${WHAT_TO_SCAN:3:2} != 0 ]; then
-+ echo ":->W_SCAN $DATE DVB-C" >> channels.conf-$DATE
- $W_SCAN -fc >> channels.conf-$DATE
- fi
- echo -e -n $NORMAL
-@@ -671,55 +673,34 @@
-
- function CopyConf ()
- {
-- if [ -s channels.conf-$DATE ]; then
-- clear
-- echo -e -n $SUCCESS
-- echo "****************************************************************"
-- echo "* *"
-- echo "* w_scan is done. *"
-- echo -e "* The output file is called "$FAILURE"channels.conf-$DATE"$SUCCESS". *"
-- echo "* Should I copy this to default location for you? [y/n] *"
-- echo "* *"
-- echo "****************************************************************"
-- echo -e -n $NORMAL && tput sgr0
-- read RESPONSE
-- echo -e -n $NORMAL
-- if [ "$RESPONSE" != "y" ]; then
-- echo "Copying channels.conf skipped - okay."
-- echo "The channels.conf generated can be found at"
-- echo -n -e "\\033[1;34m"
-- echo "$(pwd)/channels.conf-$DATE"
-- echo ""
-- echo -e -n $NORMAL
-- else
-- if [ -d /etc/vdr ]; then
-- mv /etc/vdr/channels.conf /etc/vdr/channels.conf-backup$DATE
-- cp channels.conf-$DATE /etc/vdr/channels.conf
-- fi
-- if [ -d /var/lib/vdr ]; then
-- mv /var/lib/vdr/channels.conf /var/lib/vdr/channels.conf-backup$DATE
-- cp channels.conf-$DATE /var/lib/vdr/channels.conf
-- fi
-- fi
-- else
-- clear
-- echo -e -n $FAILURE
-- echo "****************************************************************"
-- echo "* *"
-- echo "* Something went wrong. The channels.conf generated is *EMPTY*!*"
-- echo "* To analyze your problem I recommend the command *"
-- echo "* './w_scan 2>&1 | tee w_scan.log-dvbt && *"
-- echo "* ./w_scan -fc 2>&1 | tee w_scan.log-dvbc' *"
-- echo "* *"
-- echo "* w_scan will report the problem into the logfiles *"
-- echo "* w_scan.log-dvbt and w_scan.log-dvbc. *"
-- echo "* *"
-- echo "* PRESS ANY KEY TO CONTINUE *"
-- echo "****************************************************************"
-+ echo -e -n $SUCCESS
-+ echo "****************************************************************"
-+ echo "* *"
-+ echo "* w_scan is done. *"
-+ echo -e "* The output file is called "$FAILURE"channels.conf-$DATE"$SUCCESS". *"
-+ echo "* Should I copy this to default location for you? [y/n] *"
-+ echo "* *"
-+ echo "****************************************************************"
-+ echo -e -n $NORMAL && tput sgr0
-+ read RESPONSE
-+ echo -e -n $NORMAL
-+ if [ "$RESPONSE" != "y" ]; then
-+ echo "Copying channels.conf skipped - okay."
-+ echo "The channels.conf generated can be found at"
-+ echo -n -e "\\033[1;34m"
-+ echo "$(pwd)/channels.conf-$DATE"
-+ echo ""
- echo -e -n $NORMAL
-- read
-+ else
-+ if [ -d /opt/vdr/etc ]; then
-+ mv /opt/vdr/etc/channels.conf /opt/vdr/etc/channels.conf-backup$DATE
-+ cp channels.conf-$DATE /opt/vdr/etc/channels.conf
-+ fi
-+ if [ -d /var/lib/vdr ]; then
-+ mv /var/lib/vdr/channels.conf /var/lib/vdr/channels.conf-backup$DATE
-+ cp channels.conf-$DATE /var/lib/vdr/channels.conf
-+ fi
- fi
--
- }
-
- # the program itself.
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2012-11-13 17:29 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121113172946.17062200C1@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox