'[Ipcop-svn] SF.net SVN: ipcop:[4598] ipcop/trunk/lfs'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ipcop-svn
Subject:    [Ipcop-svn] SF.net SVN: ipcop:[4598] ipcop/trunk/lfs
From:       gespinasse () users ! sourceforge ! net
Date:       2010-05-21 15:03:47
Message-ID: E1OFTlL-0004kH-08 () sfp-svn-4 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 4598
          http://ipcop.svn.sourceforge.net/ipcop/?rev=4598&view=rev
Author:   gespinasse
Date:     2010-05-21 15:03:46 +0000 (Fri, 21 May 2010)

Log Message:
-----------
We should not need both allow the mkdir command to fail (if directory is present) and \
ignore with -p if error happen Use -p in an uniform way
The only remaining is lfs/glibc that I will commit when ready for 1.11.2 and \
cross-compilation

Modified Paths:
--------------
    ipcop/trunk/lfs/fcdsl
    ipcop/trunk/lfs/fcdsl2
    ipcop/trunk/lfs/fcdslsl
    ipcop/trunk/lfs/initramfs
    ipcop/trunk/lfs/ipcop-gui
    ipcop/trunk/lfs/logwatch
    ipcop/trunk/lfs/misc-progs
    ipcop/trunk/lfs/ntp
    ipcop/trunk/lfs/openswan
    ipcop/trunk/lfs/ppp
    ipcop/trunk/lfs/rrdtool
    ipcop/trunk/lfs/slang
    ipcop/trunk/lfs/squid
    ipcop/trunk/lfs/stage2
    ipcop/trunk/lfs/ulogd

Modified: ipcop/trunk/lfs/fcdsl
===================================================================
--- ipcop/trunk/lfs/fcdsl	2010-05-21 14:43:34 UTC (rev 4597)
+++ ipcop/trunk/lfs/fcdsl	2010-05-21 15:03:46 UTC (rev 4598)
@@ -89,9 +89,9 @@
 	cd $(DIR_APP) && make KDIR=/lib/modules/$(KVER)/extra install
 	gzip -fn9 /lib/modules/$(KVER)/extra/fcdsl.ko
 
-	-mkdir /usr/lib/isdn
+	mkdir -p /usr/lib/isdn
 	cd $(DIR_APP) && install -m 0644 fdslbase.bin /usr/lib/isdn
-	-mkdir /etc/fcdsl
+	mkdir -p /etc/fcdsl
 	echo "# card          file            proto   io      irq     mem     cardnr  \
options"	>  /etc/fcdsl/fcdsl.conf  echo "fcdsl           fdslbase.bin    -       -    \
-       -       -"		>> /etc/fcdsl/fcdsl.conf  cd $(DIR_APP) && cp license.txt \
/lib/modules/$(KVER)/extra/license.txt

Modified: ipcop/trunk/lfs/fcdsl2
===================================================================
--- ipcop/trunk/lfs/fcdsl2	2010-05-21 14:43:34 UTC (rev 4597)
+++ ipcop/trunk/lfs/fcdsl2	2010-05-21 15:03:46 UTC (rev 4598)
@@ -89,12 +89,12 @@
 	cd $(DIR_APP) && make KDIR=/lib/modules/$(KVER)/extra install
 	gzip -fn9 /lib/modules/$(KVER)/extra/fcdsl2.ko
 
-	-mkdir /usr/lib/isdn
+	mkdir -p /usr/lib/isdn
 	cd $(DIR_APP) && install -m 0644 fds2base.bin /usr/lib/isdn
-	-mkdir /etc/fcdsl
+	mkdir -p /etc/fcdsl
 	echo "# card          file            proto   io      irq     mem     cardnr  \
options"	> /etc/fcdsl/fcdsl2.conf  echo "fcdsl2           fds2base.bin    -       -   \
                -       -       -"	>> /etc/fcdsl/fcdsl2.conf
-	-mkdir /etc/drdsl # install drdsl.ini from a 3.11.4 version as it has more lines \
than previous versions +	mkdir -p /etc/drdsl # install drdsl.ini from a 3.11.4 \
version as it has more lines than previous versions  cd $(DIR_APP) && install -m 0644 \
drdsl.ini /etc/drdsl  cd $(DIR_APP) && install -m 0755 drdsl /etc/drdsl
 	@rm -rf $(DIR_APP)

Modified: ipcop/trunk/lfs/fcdslsl
===================================================================
--- ipcop/trunk/lfs/fcdslsl	2010-05-21 14:43:34 UTC (rev 4597)
+++ ipcop/trunk/lfs/fcdslsl	2010-05-21 15:03:46 UTC (rev 4598)
@@ -89,9 +89,9 @@
 	cd $(DIR_APP) && make KDIR=/lib/modules/$(KVER)/extra install
 	gzip -fn9 /lib/modules/$(KVER)/extra/fcdslsl.ko
 
-	-mkdir /usr/lib/isdn
+	mkdir -p /usr/lib/isdn
 	cd $(DIR_APP) && install -m 0644 fdssbase.bin /usr/lib/isdn
-	-mkdir /etc/fcdsl
+	mkdir -p /etc/fcdsl
 	echo "# card          file            proto   io      irq     mem     cardnr  \
options"	>  /etc/fcdsl/fcdslsl.conf  echo "fcdslsl           fdssbase.bin    -       \
-       -       -       -"		>> /etc/fcdsl/fcdslsl.conf  

Modified: ipcop/trunk/lfs/initramfs
===================================================================
--- ipcop/trunk/lfs/initramfs	2010-05-21 14:43:34 UTC (rev 4597)
+++ ipcop/trunk/lfs/initramfs	2010-05-21 15:03:46 UTC (rev 4598)
@@ -304,7 +304,7 @@
 	cp -f /lib/modules/$(KVER)/modules.{pcimap,usbmap} \
$(INITRAMFS_DIR)/lib/modules/$(KVER)  
 	# Create the images directory
-	-mkdir -p /$(INSTALLER_DIR)/images
+	mkdir -p /$(INSTALLER_DIR)/images
 	#################################################################################################
  #################################################################################################
  # END of general section									#

Modified: ipcop/trunk/lfs/ipcop-gui
===================================================================
--- ipcop/trunk/lfs/ipcop-gui	2010-05-21 14:43:34 UTC (rev 4597)
+++ ipcop/trunk/lfs/ipcop-gui	2010-05-21 15:03:46 UTC (rev 4598)
@@ -59,14 +59,14 @@
 $(TARGET) : $(firstword $(MAKEFILE_LIST)) $(DIR_SRC)/html/cgi-bin/* \
$(DIR_SRC)/html/html/* $(DIR_SRC)/html/html/images/* $(DIR_SRC)/html/html/include/*  \
@$(PREBUILD)  
-	-mkdir -p /home/httpd
+	mkdir -p /home/httpd
 	# Copy all html/cgi-bin files
 	cp -aR $(DIR_SRC)/html/* /home/httpd
 	-find /home/httpd -name .svn -exec rm -rf {} \;
 
 	# Additional directories for RRD graphs and Squid graphs
-	-mkdir -p /home/httpd/html/graphs
-	-mkdir -p /home/httpd/html/sgraph
+	mkdir -p /home/httpd/html/graphs
+	mkdir -p /home/httpd/html/sgraph
 
 	chown -R root:root /home/httpd
 	chmod -R 755 /home/httpd/cgi-bin
@@ -74,12 +74,12 @@
 	chmod 755 /home/httpd/html \
/home/httpd/html/{index.cgi,graphs,images,include,sgraph}  
 	# backup directory needs nobody:nobody permissions
-	-mkdir -p /home/httpd/html/backup
+	mkdir -p /home/httpd/html/backup
 	chown nobody:nobody /home/httpd/html/backup
 	chmod 744 /home/httpd/html/backup
 
 	# vhost81 directories need nobody:nobody permissions
-	-mkdir -p /home/httpd/vhost81/cgi-bin
+	mkdir -p /home/httpd/vhost81/cgi-bin
 	chown -R nobody:nobody /home/httpd/vhost81/*
 	chmod -R 755 /home/httpd/vhost81/cgi-bin
 	chmod -R 644 /home/httpd/vhost81/html

Modified: ipcop/trunk/lfs/logwatch
===================================================================
--- ipcop/trunk/lfs/logwatch	2010-05-21 14:43:34 UTC (rev 4597)
+++ ipcop/trunk/lfs/logwatch	2010-05-21 15:03:46 UTC (rev 4598)
@@ -82,9 +82,9 @@
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 
-	-mkdir -p /etc/logwatch/lib /var/log/logwatch
-	-mkdir -p /etc/logwatch/conf/{logfiles,services}
-	-mkdir -p /etc/logwatch/scripts/{services,shared}
+	mkdir -p /etc/logwatch/lib /var/log/logwatch
+	mkdir -p /etc/logwatch/conf/{logfiles,services}
+	mkdir -p /etc/logwatch/scripts/{services,shared}
 	chown logwatch:nobody /var/log/logwatch
 	cd $(DIR_APP) && cp -Rf lib /etc/logwatch
 	cd $(DIR_APP) && cp conf/{logwatch.conf,ignore.conf} /etc/logwatch/conf
@@ -92,7 +92,7 @@
 	cd $(DIR_APP) && install -m 0755 scripts/logwatch.pl \
/etc/logwatch/scripts/logwatch.pl  cd $(DIR_APP) && install -m 0644 logwatch.8 \
/usr/share/man/man8  
-        # change BaseDir
+	# change BaseDir
 	sed -i -e 's/my $$BaseDir = .*/my $$BaseDir = "\/etc\/logwatch";/' \
/etc/logwatch/scripts/logwatch.pl  # change TmpDir
 	sed -i -e 's/TmpDir = .*/TmpDir = \/tmp/' /etc/logwatch/conf/logwatch.conf

Modified: ipcop/trunk/lfs/misc-progs
===================================================================
--- ipcop/trunk/lfs/misc-progs	2010-05-21 14:43:34 UTC (rev 4597)
+++ ipcop/trunk/lfs/misc-progs	2010-05-21 15:03:46 UTC (rev 4598)
@@ -60,7 +60,7 @@
 	@$(PREBUILD)
 
 	# rc.d scripts
-	-mkdir -p /etc/rc.d
+	mkdir -p /etc/rc.d
 	cp -fv $(DIR_SRC)/src/rc.d/rc.* /etc/rc.d
 	chmod -R 755 /etc/rc.d
 
@@ -83,7 +83,7 @@
 	done
 
 	# lib files containing helper subs
-	-mkdir -p /usr/lib/ipcop
+	mkdir -p /usr/lib/ipcop
 	cp -fv $(DIR_SRC)/src/libs/* /usr/lib/ipcop
 	for i in `find $(DIR_SRC)/src/libs -maxdepth 1 -type f`; do \
 		chmod 644 /usr/lib/ipcop/`basename $$i`; \

Modified: ipcop/trunk/lfs/ntp
===================================================================
--- ipcop/trunk/lfs/ntp	2010-05-21 14:43:34 UTC (rev 4597)
+++ ipcop/trunk/lfs/ntp	2010-05-21 15:03:46 UTC (rev 4598)
@@ -98,7 +98,7 @@
 	cd $(DIR_APP) && make install
 	
 	# create configdir and symlink the ntp configfile to /var/ipcop/time/ntp.conf
-	-mkdir /var/log/ntp
+	mkdir -p /var/log/ntp
 	chown -R ntp:ntp /var/log/ntp
 	ln -sf /var/ipcop/time/ntp.conf /etc/ntp.conf
 

Modified: ipcop/trunk/lfs/openswan
===================================================================
--- ipcop/trunk/lfs/openswan	2010-05-21 14:43:34 UTC (rev 4597)
+++ ipcop/trunk/lfs/openswan	2010-05-21 15:03:46 UTC (rev 4598)
@@ -117,7 +117,7 @@
 
 	# minstall run depmod against the running kernel, not using our KVER
 	# so install manually
-	-mkdir -p /lib/modules/$(KVER)/kernel/net/ipsec
+	mkdir -p /lib/modules/$(KVER)/kernel/net/ipsec
 	install -m 0644 $(DIR_APP)/modobj26/ipsec.ko \
/lib/modules/$(KVER)/kernel/net/ipsec/ipsec.ko  gzip -fn9 \
/lib/modules/$(KVER)/kernel/net/ipsec/ipsec.ko  endif

Modified: ipcop/trunk/lfs/ppp
===================================================================
--- ipcop/trunk/lfs/ppp	2010-05-21 14:43:34 UTC (rev 4597)
+++ ipcop/trunk/lfs/ppp	2010-05-21 15:03:46 UTC (rev 4598)
@@ -99,7 +99,7 @@
 	cd $(DIR_APP) && make install
 
 	touch /var/log/connect-errors
-	-mkdir -p /etc/ppp
+	mkdir -p /etc/ppp
 	cp $(DIR_SRC)/config/ppp/* /etc/ppp
 	chmod 755 /etc/ppp/{dialer,ip-up,ip-down}
 	ln -sf /var/ipcop/ppp/secrets /etc/ppp/pap-secrets

Modified: ipcop/trunk/lfs/rrdtool
===================================================================
--- ipcop/trunk/lfs/rrdtool	2010-05-21 14:43:34 UTC (rev 4597)
+++ ipcop/trunk/lfs/rrdtool	2010-05-21 15:03:46 UTC (rev 4598)
@@ -103,7 +103,7 @@
 	cd $(DIR_APP) && make -j $(PARALLELISM)
 	cd $(DIR_APP) && make install-exec
 	cd $(DIR_APP) && make site-perl-install
-	-mkdir -p /var/log/rrd/
+	mkdir -p /var/log/rrd/
 
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)

Modified: ipcop/trunk/lfs/slang
===================================================================
--- ipcop/trunk/lfs/slang	2010-05-21 14:43:34 UTC (rev 4597)
+++ ipcop/trunk/lfs/slang	2010-05-21 15:03:46 UTC (rev 4598)
@@ -100,7 +100,7 @@
 	# Actually shared lib (even reduced by mklibs) produce an overall bigger code for \
the installer  cd $(DIR_APP) && make
 	cd $(DIR_APP) && install -m 0644 src/objs/libslang.a /usr/lib
-	-mkdir -p /usr/include/slang
+	mkdir -p /usr/include/slang
 	cd $(DIR_APP) && install -m 0644 src/slang.h src/slcurses.h /usr/include/slang
 
 	# If we want to use as shared lib, uncomment that

Modified: ipcop/trunk/lfs/squid
===================================================================
--- ipcop/trunk/lfs/squid	2010-05-21 14:43:34 UTC (rev 4597)
+++ ipcop/trunk/lfs/squid	2010-05-21 15:03:46 UTC (rev 4598)
@@ -125,8 +125,8 @@
 
 	ln -sf /var/ipcop/proxy/squid.conf /etc/squid/squid.conf
 
-	-mkdir -p /var/log/cache
-	-mkdir -p /var/log/squid
+	mkdir -p /var/log/cache
+	mkdir -p /var/log/squid
 	touch /var/log/squid/access.log
 	chown -R squid:squid /var/log/squid /var/log/cache
 

Modified: ipcop/trunk/lfs/stage2
===================================================================
--- ipcop/trunk/lfs/stage2	2010-05-21 14:43:34 UTC (rev 4597)
+++ ipcop/trunk/lfs/stage2	2010-05-21 15:03:46 UTC (rev 4598)
@@ -62,9 +62,9 @@
 	# use 0:0 as etc is not yet installed
 	chown 0:0 /usr /usr/src
 	# Create directories not already made by make.sh
-	-mkdir -p /{boot,etc,home,lib/firmware,mnt}
-	-mkdir -p /{root,sbin,tmp,usr/local,var}
-	-for dirname in /usr /usr/local; do \
+	mkdir -p /{boot,etc,home,lib/firmware,mnt}
+	mkdir -p /{root,sbin,tmp,usr/local,var}
+	for dirname in /usr /usr/local; do \
 		mkdir -p $$dirname/{bin,include,lib,sbin,share}; \
 		ln -sfn share/{man,doc,info} $$dirname; \
 		mkdir -p $$dirname/share/{dict,doc,info,locale,man}; \
@@ -82,8 +82,8 @@
 		ln -sfn libgcc_s.so.1 /lib/libgcc_s.so; \
 	fi
 
-	-mkdir -p /var/{lock/subsys,log,mail,run,spool}
-	-mkdir -p /var/{tmp,cache,lib/misc,local,empty}
+	mkdir -p /var/{lock/subsys,log,mail,run,spool}
+	mkdir -p /var/{tmp,cache,lib/misc,local,empty}
 
 	# Permissions
 	chmod 0750 /root
@@ -109,11 +109,11 @@
 	echo "$(NAME) v$(VERSION) for $(MACHINE) - $(SLOGAN) (\l)" > /etc/issue
 
 	# Nobody user
-	-mkdir -p /home/nobody
+	mkdir -p /home/nobody
 	chown -R nobody:nobody /home/nobody
 
 	# Patches directory
-	-mkdir -m 1775 -p /var/patches
+	mkdir -m 1775 -p /var/patches
 	chown -R root:nobody /var/patches
 
 	# fix setuid programs in case of direct toolchain build

Modified: ipcop/trunk/lfs/ulogd
===================================================================
--- ipcop/trunk/lfs/ulogd	2010-05-21 14:43:34 UTC (rev 4597)
+++ ipcop/trunk/lfs/ulogd	2010-05-21 15:03:46 UTC (rev 4598)
@@ -84,7 +84,7 @@
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 	# remove database(s) in case of a partial build
 	rm -f /var/ipcop/traffic/empty-account.db
-	rm -f  /var/log/ulogd/account.db
+	rm -f /var/log/ulogd/account.db
 
 	cd $(DIR_APP) && ./configure --prefix=/usr \
 													--sysconfdir=/etc \
@@ -100,7 +100,7 @@
 	cp $(DIR_SRC)/config/ulogd/ulogd.conf /etc/
 
 	# database in /var/log
-	-mkdir -p /var/log/ulogd/
+	mkdir -p /var/log/ulogd/
 	sed -i -e 's+DATABASEDIR+/var/log/ulogd+' /etc/ulogd.conf
 	sed -i -e 's+LIBDIR+/usr/lib/ulogd+' /etc/ulogd.conf
 	# Create database, since we currently cannot create a fresh new DB in target system


This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.

------------------------------------------------------------------------------

_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn


[prev in list] [next in list] [prev in thread] [next in thread]
Configure | About | News | Add a list | Sponsored by KoreLogic