[Lunar-commits] <moonbase-core> Merge branch 'master' of github.com:lunar-linux/moonbase-core

[Stefan Wold]

commit 27e282e80d8ea7797517dc4ab67ed547a0af2c87
Author: Stefan Wold <ratler at lunar-linux.org>
Date: Thu, 05 Sep 2013 11:10:16 -0700
URL: https://github.com/lunar-linux/moonbase-core/commit/27e282e80d8ea7797517dc4ab67ed547a0af2c87

Merge branch 'master' of github.com:lunar-linux/moonbase-core
---
  filesys/fhs/BUILD     | +46/-0    
  filesys/fhs/DETAILS   | +13/-0    
  filesys/fhs/PRE_BUILD | +1/-0     
  ftp/lftp/DETAILS      | +3/-3     
  kernel/dracut/BUILD   | +0/-5     
  kernel/dracut/DETAILS | +3/-6     
  kernel/kmod/DETAILS   | +3/-3     
  7 files changed, 69 insertions(+), 17 deletions(-)

--- /dev/null
+++ b/filesys/fhs/BUILD
@@ -0,0 +1,46 @@
+prepare_install &&
+
+# / Requirements
+mkdir -p /{bin,boot,dev,etc,lib,media,mnt,opt,sbin,srv,tmp,usr,var} &&
+
+# / Specific Options
+mkdir -p /{home,root} &&
+
+# /etc Requirements
+mkdir -p /etc/opt &&
+
+# /etc Specific Options
+ln -sf /proc/self/mounts /etc/mtab &&
+
+# /lib Specific Options
+mkdir -p /lib/modules &&
+
+# /usr Requirements
+mkdir -p /usr/{bin,include,lib,local,sbin,share} &&
+
+# /usr Specific Options
+mkdir -p /usr/{games,src} &&
+
+# /usr/local Requirements
+mkdir -p /usr/local/{bin,etc,games,include,lib,man,sbin,share,src} &&
+
+# /usr/share Requirements
+mkdir -p /usr/share/{man,misc} &&
+
+# /usr/share Specific Options
+mkdir -p /usr/share/games &&
+
+# /var Requirements
+mkdir -p /var/{cache,lib,local,log,opt,spool,tmp} &&
+# /var Systemd addition
+ln -sfT ../run /var/run &&
+ln -sfT ../run/lock /var/lock &&
+
+# /var Specific Options
+mkdir -p /var/games &&
+
+# Linux addition
+mkdir -p /{proc,sys} &&
+
+# / Systemd addition
+mkdir -p /run/lock
--- /dev/null
+++ b/filesys/fhs/DETAILS
@@ -0,0 +1,13 @@
+          MODULE=fhs
+         VERSION=2.3
+        WEB_SITE=http://refspecs.linuxfoundation.org/fhs.shtml
+         ENTERED=20130829
+         UPDATED=20130829
+           SHORT="Filesystem Hierarchy Standard"
+
+cat << EOF
+This package contains the directories specified by the Filesystem
+Hierarchy Standard.
+
+Directories required by systemd are also added.
+EOF
--- /dev/null
+++ b/filesys/fhs/PRE_BUILD
@@ -0,0 +1 @@
+:
--- a/ftp/lftp/DETAILS
+++ b/ftp/lftp/DETAILS
@@ -1,13 +1,13 @@
           MODULE=lftp
-         VERSION=4.4.8
+         VERSION=4.4.9
           SOURCE=$MODULE-$VERSION.tar.xz
    SOURCE_URL[0]=ftp://ftp.yars.free.net/pub/source/$MODULE
    SOURCE_URL[1]=ftp://ftp.cs.tu-berlin.de/pub/net/ftp/$MODULE
    SOURCE_URL[2]=ftp://ftp.130th.net/pub/mirror/$MODULE
-      SOURCE_VFY=sha1:bcd12f51e8389c72a8348c09188a31f7e940188d
+      SOURCE_VFY=sha1:7cd365cd4bc572ca96fc86cbe714507a9d8c765c
         WEB_SITE=http://lftp.yar.ru
          ENTERED=20010922
-         UPDATED=20130607
+         UPDATED=20130826
            SHORT="A sophisticated ftp/http client, file transfer program"
 
 cat << EOF
--- a/kernel/dracut/BUILD
+++ b/kernel/dracut/BUILD
@@ -1,6 +1,3 @@
-(
-
-  patch_it $SOURCE2 1 &&
   sedit 's:dash:bash:' Makefile &&
 
   default_build &&
@@ -15,5 +12,3 @@
   cp -R $SCRIPT_DIRECTORY/dracut.d/90lunar-live /usr/lib/dracut/modules.d/ &&
 
   gather_docs HACKING TODO AUTHORS
-
-) > $C_FIFO 2>&1
--- a/kernel/dracut/DETAILS
+++ b/kernel/dracut/DETAILS
@@ -1,15 +1,12 @@
            MODULE=dracut
-          VERSION=024
+          VERSION=032
            SOURCE=$MODULE-$VERSION.tar.xz
-          SOURCE2=0077-i18n-module-setup.sh-do-not-install-systemd-vconsole.patch
        SOURCE_URL=http://www.kernel.org/pub/linux/utils/boot/dracut
-      SOURCE2_URL=$PATCH_URL
  SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
-       SOURCE_VFY=sha1:82b195b6028e7d0b84108b1d6b7d7e6bbfb9d1fa
-      SOURCE2_VFY=sha1:04a75b432e5efe50f77dc6b2b4f54961cb35640e
+       SOURCE_VFY=sha1:bfaed61ecffa213af56acec6a5d5b9b323174e2e
          WEB_SITE=https://dracut.wiki.kernel.org/index.php/Main_Page
           ENTERED=20120715
-          UPDATED=20121223
+          UPDATED=20130830
             SHORT="Initramfs generator using udev"
 COMPRESS_MANPAGES=off # If we compress them it will mess up an upgrade for this module due to symlinks
 
--- a/kernel/kmod/DETAILS
+++ b/kernel/kmod/DETAILS
@@ -1,11 +1,11 @@
           MODULE=kmod
-         VERSION=14
+         VERSION=15
           SOURCE=$MODULE-$VERSION.tar.xz
       SOURCE_URL=ftp://ftp.kernel.org/pub/linux/utils/kernel/$MODULE
-      SOURCE_VFY=sha1:a9fa2993369a285f45aef11a8a2b56e7c57a56b1
+      SOURCE_VFY=sha1:0c191c02803eb2a935197211c6c546d2c7c374dc
         WEB_SITE=http://www.politreco.com/2011/12/announce-kmod-1
          ENTERED=20120115
-         UPDATED=20130705
+         UPDATED=20130826
            SHORT="A lib for kernel modules management"
 
 cat << EOF