[pisa-src] r1393 - in trunk: LICENSE Makefile.am test/Makefile.am test/packaging tools/packaging tools/packaging/create-package.sh tools/packaging/pisa-deb.spec tools/packaging/pisa-rpm.spec
- From: Diego Biurrun <diego@xxxxxxxxxx>
- To: pisa-src@xxxxxxxxxxxxx
- Date: Thu, 29 Oct 2009 11:50:00 +0100
Author: biurrun
Date: Thu Oct 29 11:50:00 2009
New Revision: 1393
Log:
Move packaging directory from test/ to tools/.
The latter is a much more appropriate place for it.
Added:
trunk/tools/packaging/ (props changed)
- copied from r1391, trunk/test/packaging/
Deleted:
trunk/test/packaging/
Modified:
trunk/LICENSE
trunk/Makefile.am
trunk/test/Makefile.am
trunk/tools/packaging/create-package.sh
trunk/tools/packaging/pisa-deb.spec
trunk/tools/packaging/pisa-rpm.spec
Modified: trunk/LICENSE
==============================================================================
--- trunk/LICENSE Thu Oct 29 11:39:01 2009 (r1392)
+++ trunk/LICENSE Thu Oct 29 11:50:00 2009 (r1393)
@@ -9,4 +9,4 @@
include/uthash.h
GPL (version 2):
-test/packaging/create-package.sh
+tools/packaging/create-package.sh
Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am Thu Oct 29 11:39:01 2009 (r1392)
+++ trunk/Makefile.am Thu Oct 29 11:50:00 2009 (r1393)
@@ -15,6 +15,14 @@
EXTRA_DIST += tools/auto-handover.sh tools/trigger-demo-update.sh
EXTRA_DIST += tools/trigger-hipupdate.sh
EXTRA_DIST += tools/tunnel/seteth1address
+EXTRA_DIST += tools/packaging/create-package.sh
+EXTRA_DIST += tools/packaging/debbuild
+EXTRA_DIST += tools/packaging/debian-init.d-pisacd
+EXTRA_DIST += tools/packaging/debian-init.d-pisasd
+EXTRA_DIST += tools/packaging/pisa-deb.spec
+EXTRA_DIST += tools/packaging/pisa-rpm.spec
+EXTRA_DIST += tools/packaging/rh-init.d-pisacd
+EXTRA_DIST += tools/packaging/rh-init.d-pisasd
sbin_PROGRAMS = pisabeacon/pisabeacon tools/iwlist_parser tools/msleep
@@ -37,4 +45,4 @@
SUBDIRS += community-operator # has to be enabled for compilation on openwrt
deb rpm:
- test/packaging/create-package.sh $@
+ tools/packaging/create-package.sh $@
Modified: trunk/test/Makefile.am
==============================================================================
--- trunk/test/Makefile.am Thu Oct 29 11:39:01 2009 (r1392)
+++ trunk/test/Makefile.am Thu Oct 29 11:50:00 2009 (r1393)
@@ -3,23 +3,12 @@
#
# Author: Dongsu Park <dpark1978@xxxxxxxxx>
-EXTRA_DIST =
-
bin_PROGRAMS = checkhipd
bin_PROGRAMS += getns
bin_PROGRAMS += ifaddr
bin_PROGRAMS += udpserver
bin_PROGRAMS += udpclient
-EXTRA_DIST += packaging/create-package.sh
-EXTRA_DIST += packaging/debbuild
-EXTRA_DIST += packaging/debian-init.d-pisacd
-EXTRA_DIST += packaging/debian-init.d-pisasd
-EXTRA_DIST += packaging/pisa-deb.spec
-EXTRA_DIST += packaging/pisa-rpm.spec
-EXTRA_DIST += packaging/rh-init.d-pisacd
-EXTRA_DIST += packaging/rh-init.d-pisasd
-
if PISA_FORCE_SHLIB
LDFLAGS += -L../libpisa -lpisa
else
Modified: trunk/tools/packaging/create-package.sh
==============================================================================
--- trunk/test/packaging/create-package.sh Wed Oct 28 16:38:21 2009
(r1391)
+++ trunk/tools/packaging/create-package.sh Thu Oct 29 11:50:00 2009
(r1393)
@@ -19,7 +19,7 @@
VERSION=
NAME=pisa
PKGROOT=$PWD
-PKGEXE=$PKGROOT/test/packaging
+PKGEXE=$PKGROOT/tools/packaging
PKG_WEB_DIR=
PKG_SERVER_DIR=
DEBDIR=$PWD/debbuild
Modified: trunk/tools/packaging/pisa-deb.spec
==============================================================================
--- trunk/test/packaging/pisa-deb.spec Wed Oct 28 16:38:21 2009 (r1391)
+++ trunk/tools/packaging/pisa-deb.spec Thu Oct 29 11:50:00 2009 (r1393)
@@ -57,8 +57,8 @@
install -d %{buildroot}/etc/init.d
install -d %{buildroot}/etc/pisa
make DESTDIR=%{buildroot} install
-install -m 700 test/packaging/debian-init.d-pisacd
%{buildroot}/etc/init.d/pisacd
-install -m 700 test/packaging/debian-init.d-pisasd
%{buildroot}/etc/init.d/pisasd
+install -m 700 tools/packaging/debian-init.d-pisacd
%{buildroot}/etc/init.d/pisacd
+install -m 700 tools/packaging/debian-init.d-pisasd
%{buildroot}/etc/init.d/pisasd
install -m 644 pisacd/pisacd.conf %{buildroot}/etc/pisa/pisacd.conf
install -m 644 pisasd/pisasd.conf %{buildroot}/etc/pisa/pisasd.conf
Modified: trunk/tools/packaging/pisa-rpm.spec
==============================================================================
--- trunk/test/packaging/pisa-rpm.spec Wed Oct 28 16:38:21 2009 (r1391)
+++ trunk/tools/packaging/pisa-rpm.spec Thu Oct 29 11:50:00 2009 (r1393)
@@ -60,8 +60,8 @@
install -d %{buildroot}/etc/rc.d/init.d
#install -d %{buildroot}/doc
make DESTDIR=%{buildroot} install
-install -m 700 test/packaging/rh-init.d-pisacd
%{buildroot}/etc/rc.d/init.d/pisacd
-install -m 700 test/packaging/rh-init.d-pisasd
%{buildroot}/etc/rc.d/init.d/pisasd
+install -m 700 tools/packaging/rh-init.d-pisacd
%{buildroot}/etc/rc.d/init.d/pisacd
+install -m 700 tools/packaging/rh-init.d-pisasd
%{buildroot}/etc/rc.d/init.d/pisasd
%post lib
/sbin/ldconfig
Other related posts:
- » [pisa-src] r1393 - in trunk: LICENSE Makefile.am test/Makefile.am test/packaging tools/packaging tools/packaging/create-package.sh tools/packaging/pisa-deb.spec tools/packaging/pisa-rpm.spec - Diego Biurrun
