Revision: 7742
http://sourceforge.net/p/ipcop/svn/7742
Author: owes
Date: 2014-12-10 11:30:23 +0000 (Wed, 10 Dec 2014)
Log Message:
-----------
Add /etc/svn-install to indicate SVN revision used to install IPCop. Makes it
much easier to track test versions.
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/stage2
ipcop/trunk/doc/files-with-different-md5
ipcop/trunk/lfs/stage2
ipcop/trunk/make.sh
Modified: ipcop/trunk/config/rootfiles/common/stage2
===================================================================
--- ipcop/trunk/config/rootfiles/common/stage2 2014-12-08 15:54:33 UTC (rev
7741)
+++ ipcop/trunk/config/rootfiles/common/stage2 2014-12-10 11:30:23 UTC (rev
7742)
@@ -25,6 +25,7 @@
etc/resolv.conf
etc/rsyslog.conf
etc/securetty
+etc/svn-install
etc/sysctl.conf
etc/sysctlpostinit.conf
#home
Modified: ipcop/trunk/doc/files-with-different-md5
===================================================================
--- ipcop/trunk/doc/files-with-different-md5 2014-12-08 15:54:33 UTC (rev
7741)
+++ ipcop/trunk/doc/files-with-different-md5 2014-12-10 11:30:23 UTC (rev
7742)
@@ -4,9 +4,10 @@
/boot/System.map symlink to
/boot/System.map-`/bin/uname -r`
/boot/vmlinuz symlink to
/boot/vmlinuz-`/bin/uname -r`
/boot/vmlinuz-KVER contain the timestamp
seen with uname -a
-/etc/issue contains IPCop version
number
+/etc/issue contains IPCop version
number
/etc/ld.so.cache list of libraries will
be regenerated by ldconfig automatically
/etc/shadow contains 'Last password
change' (days since 1-1-1970)
+/etc/svn-install contains IPCop build
SVN revision
/lib/modules/KVER/kernel/drivers/char/nozomi.ko.gz __DATE__
/lib/modules/KVER/kernel/drivers/scsi/in2000.ko.gz __DATE__
/lib/modules/KVER/modules.alias random alias
order
Modified: ipcop/trunk/lfs/stage2
===================================================================
--- ipcop/trunk/lfs/stage2 2014-12-08 15:54:33 UTC (rev 7741)
+++ ipcop/trunk/lfs/stage2 2014-12-10 11:30:23 UTC (rev 7742)
@@ -130,6 +130,7 @@
endif
echo "$(NAME) v$(VERSION) for $(MACHINE) - $(SLOGAN) (\l)" > /etc/issue
+ echo "svn-$(PASS)" > /etc/svn-install
# Nobody user
mkdir -p /home/nobody
Modified: ipcop/trunk/make.sh
===================================================================
--- ipcop/trunk/make.sh 2014-12-08 15:54:33 UTC (rev 7741)
+++ ipcop/trunk/make.sh 2014-12-10 11:30:23 UTC (rev 7742)
@@ -1098,8 +1098,11 @@
# svn info does not grow on commit but on update
if [ -d ${BASEDIR}/.svn ]; then
- SVNREV=$(svn info | grep Revision)
- echo -e "Last svn up ${SET_OPT_COL}: ${INFO}${SVNREV}${NORMAL}"
+ SVNREV=$(svn info | grep Revision | awk '{ print $2}')
+ echo -e "Last svn up ${SET_OPT_COL}: ${INFO} Revision
${SVNREV}${NORMAL}"
+ else
+ SVNREV=0
+ echo -e "Last svn up ${SET_OPT_COL}: ${INFO}no svn history
found${NORMAL}"
fi
# Remove pre-install list of installed files in case user erase some
files before to build again
@@ -1744,7 +1747,9 @@
update-gcc-hash "/${TOOLS_DIR}/bin/${TARGET_2}-gcc"
+ PASS="${SVNREV}"
chroot_make stage2
+ PASS=""
chroot_make fix-up
chroot_make linux-headers
chroot_make glibc
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
from Actuate! Instantly Supercharge Your Business Reports and Dashboards
with Interactivity, Sharing, Native Excel Exports, App Integration & more
Get technology previously reserved for billion-dollar corporations, FREE
http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
