From f4c002f6603c520a27203ec3d07772d9e74c8b57 Mon Sep 17 00:00:00 2001 From: tnut Date: Sun, 15 May 2011 19:52:39 +0200 Subject: aaabasicfs, correction du port --- base/aaabasicfs/Pkgfile | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'base/aaabasicfs/Pkgfile') diff --git a/base/aaabasicfs/Pkgfile b/base/aaabasicfs/Pkgfile index 2bf92a15c..e5acd43d6 100644 --- a/base/aaabasicfs/Pkgfile +++ b/base/aaabasicfs/Pkgfile @@ -20,7 +20,7 @@ source=( http://www.linuxfromscratch.org/lfs/downloads/development/$scriptsvers build() { # Creating Directories - mkdir -pv $PKG/{dev,proc,sys,bin,boot,etc/{profile.d,opt,skel,default},home,lib,mnt,opt,srv/sources} + mkdir -pv $PKG/{dev,proc,sys,bin,boot,etc/{modprobe.d,profile.d,opt,skel,default},home,lib,mnt,opt,srv/sources,run} chmod 1777 $PKG/srv/sources mkdir -pv $PKG/{media/{floppy,cdrom,key,dvd},sbin,var} install -dv -m 0750 $PKG/root @@ -46,7 +46,9 @@ build() { x86_64) ln -sv lib $PKG/lib64 && ln -sv lib $PKG/usr/lib64 ;; esac - mkdir -v $PKG/var/{lock,log,mail,run,spool} + mkdir -v $PKG/var/{log,mail,spool} + ln -sv /run $PKG/var/run + ln -sv /run/lock $PKG/var/lock mkdir -pv $PKG/var/{opt,cache,lib/{misc,locate},local} touch $PKG/var/log/{kern.log,auth.log,mail.log,user.log,sys.log,daemon.log,wtmp,btmp} chmod 640 $PKG/var/log/{kern.log,auth.log,mail.log,user.log,sys.log,daemon.log} @@ -58,7 +60,14 @@ build() { mkdir -p $PKG/var/lib/pkg/ echo "$version-$release" > $PKG/var/lib/pkg/nutyx-version ln -s /var/lib/pkg/nutyx-version $PKG/etc/nutyx-version - + cat > $PKG/etc/modprobe.d/usb.conf << "EOF" +# Begin /etc/modprobe.d/usb.conf + +install ohci_hcd /sbin/modprobe ehci_hcd ; /sbin/modprobe -i ohci_hcd ; true +install uhci_hcd /sbin/modprobe ehci_hcd ; /sbin/modprobe -i uhci_hcd ; true + +# End /etc/modprobe.d/usb.conf +EOF cat > $PKG/etc/shells << "EOF" /bin/sh /bin/bash -- cgit v1.2.3-70-g09d2 From 9060e66e4a7cd80d6c6b43893d405cb1b92e6ce2 Mon Sep 17 00:00:00 2001 From: tnut Date: Sun, 15 May 2011 20:10:46 +0200 Subject: aaabasicfs, correction 32bits --- base/aaabasicfs/.footprint.i686 | 9 ++++++--- base/aaabasicfs/.md5sum.i686 | 6 +++--- base/aaabasicfs/Pkgfile | 4 ++-- 3 files changed, 11 insertions(+), 8 deletions(-) (limited to 'base/aaabasicfs/Pkgfile') diff --git a/base/aaabasicfs/.footprint.i686 b/base/aaabasicfs/.footprint.i686 index ffc6b3ac8..2082d0070 100644 --- a/base/aaabasicfs/.footprint.i686 +++ b/base/aaabasicfs/.footprint.i686 @@ -13,6 +13,8 @@ drwxr-xr-x root/root etc/default/ -rw-r--r-- root/root etc/group -rw-r--r-- root/root etc/inittab -rw-r--r-- root/root etc/inputrc +drwxr-xr-x root/root etc/modprobe.d/ +-rw-r--r-- root/root etc/modprobe.d/usb.conf -rw-r--r-- root/root etc/mtab (EMPTY) lrwxrwxrwx root/root etc/nutyx-version -> /var/lib/pkg/nutyx-version drwxr-xr-x root/root etc/opt/ @@ -168,6 +170,8 @@ lrwxrwxrwx root/root root/resolv.conf -> ../etc/resolv.conf lrwxrwxrwx root/root root/shells -> ../etc/shells lrwxrwxrwx root/root root/unmask.sh -> ../etc/profile.d/unmask.sh lrwxrwxrwx root/root root/useradd -> ../etc/default/useradd +drwxr-xr-x root/root run/ +-rw-rw-r-- root/utmp run/utmp (EMPTY) drwxr-xr-x root/root sbin/ drwxr-xr-x root/root srv/ drwxrwxrwt root/root srv/sources/ @@ -236,7 +240,7 @@ drwxr-xr-x root/root var/lib/pkg/ -rw-r--r-- root/root var/lib/pkg/blfs-bootscripts -rw-r--r-- root/root var/lib/pkg/nutyx-version drwxr-xr-x root/root var/local/ -drwxr-xr-x root/root var/lock/ +lrwxrwxrwx root/root var/lock -> ../run/lock drwxr-xr-x root/root var/log/ -rw-r----- root/root var/log/auth.log (EMPTY) -rw------- root/root var/log/btmp (EMPTY) @@ -249,7 +253,6 @@ drwxr-xr-x root/root var/log/ -rw-r--r-- root/root var/log/wtmp (EMPTY) drwxr-xr-x root/root var/mail/ drwxr-xr-x root/root var/opt/ -drwxr-xr-x root/root var/run/ --rw-rw-r-- root/utmp var/run/utmp (EMPTY) +lrwxrwxrwx root/root var/run -> ../run drwxr-xr-x root/root var/spool/ drwxrwxrwt root/root var/tmp/ diff --git a/base/aaabasicfs/.md5sum.i686 b/base/aaabasicfs/.md5sum.i686 index 0c2625d57..4b409fb74 100644 --- a/base/aaabasicfs/.md5sum.i686 +++ b/base/aaabasicfs/.md5sum.i686 @@ -2,11 +2,11 @@ b9bdd0860e6e4810f5b5e094e4d50aa4 X.sh 61ba4859757a54bf1f514de5213802e0 bash_profile f29eb765bd7c24471d055cc72b0edd4e bashrc 3974f1b4242908346f309b096a7a6ed6 bashrc.etc -b7f67cb6cdc94937e9a13fc22b387305 blfs-bootscripts-20100825.tar.bz2 +deb0289f1ce9bac5cfd09c869648a6d3 blfs-bootscripts-20100825.tar.bz2 248d4faa838949085a51003b2c0c3f00 dircolors.sh ad457024fe7ad91b8e9e0b4aad87df1f extrapaths.sh -0286a09ca5d7515c29ad5ff8f88fb9f3 fstab -1878700f891b205d12dd93bf86ab1739 inittab +64514eb39b4878f060065cab28191ee5 fstab +4e641aa7a51f285c0a832b8a7dd8ed29 inittab 2ca09cd10bcc4f6adb0c5b1521bfdb7e inputrc 7a45a1acf3566ca924f9a32f069bd7f2 lfs-bootscripts-02.patch 5041ee97992e3f10d3be44f46a6aeb76 lfs-bootscripts-20110424.tar.bz2 diff --git a/base/aaabasicfs/Pkgfile b/base/aaabasicfs/Pkgfile index e5acd43d6..174a7ccde 100644 --- a/base/aaabasicfs/Pkgfile +++ b/base/aaabasicfs/Pkgfile @@ -47,8 +47,8 @@ build() { esac mkdir -v $PKG/var/{log,mail,spool} - ln -sv /run $PKG/var/run - ln -sv /run/lock $PKG/var/lock + ln -sv ../run $PKG/var/run + ln -sv ../run/lock $PKG/var/lock mkdir -pv $PKG/var/{opt,cache,lib/{misc,locate},local} touch $PKG/var/log/{kern.log,auth.log,mail.log,user.log,sys.log,daemon.log,wtmp,btmp} chmod 640 $PKG/var/log/{kern.log,auth.log,mail.log,user.log,sys.log,daemon.log} -- cgit v1.2.3-70-g09d2 From 92f56a2bf8b96190af76288af1c7121419fa325f Mon Sep 17 00:00:00 2001 From: tnut Date: Sun, 15 May 2011 20:36:05 +0200 Subject: aaabasicfs, suppression doublon --- base/aaabasicfs/.footprint.i686 | 1 - base/aaabasicfs/Pkgfile | 8 -------- 2 files changed, 9 deletions(-) (limited to 'base/aaabasicfs/Pkgfile') diff --git a/base/aaabasicfs/.footprint.i686 b/base/aaabasicfs/.footprint.i686 index 2082d0070..5797b10f9 100644 --- a/base/aaabasicfs/.footprint.i686 +++ b/base/aaabasicfs/.footprint.i686 @@ -14,7 +14,6 @@ drwxr-xr-x root/root etc/default/ -rw-r--r-- root/root etc/inittab -rw-r--r-- root/root etc/inputrc drwxr-xr-x root/root etc/modprobe.d/ --rw-r--r-- root/root etc/modprobe.d/usb.conf -rw-r--r-- root/root etc/mtab (EMPTY) lrwxrwxrwx root/root etc/nutyx-version -> /var/lib/pkg/nutyx-version drwxr-xr-x root/root etc/opt/ diff --git a/base/aaabasicfs/Pkgfile b/base/aaabasicfs/Pkgfile index 174a7ccde..80ac2ac94 100644 --- a/base/aaabasicfs/Pkgfile +++ b/base/aaabasicfs/Pkgfile @@ -60,14 +60,6 @@ build() { mkdir -p $PKG/var/lib/pkg/ echo "$version-$release" > $PKG/var/lib/pkg/nutyx-version ln -s /var/lib/pkg/nutyx-version $PKG/etc/nutyx-version - cat > $PKG/etc/modprobe.d/usb.conf << "EOF" -# Begin /etc/modprobe.d/usb.conf - -install ohci_hcd /sbin/modprobe ehci_hcd ; /sbin/modprobe -i ohci_hcd ; true -install uhci_hcd /sbin/modprobe ehci_hcd ; /sbin/modprobe -i uhci_hcd ; true - -# End /etc/modprobe.d/usb.conf -EOF cat > $PKG/etc/shells << "EOF" /bin/sh /bin/bash -- cgit v1.2.3-70-g09d2