# install /etc/default/ser file mkdir -p /home/darilion/software/sip-router-git-repo/debian/ser/etc/default cp -f debian/ser.default /home/darilion/software/sip-router-git-repo/debian/ser/etc/default/ser # install the *.sql files for ser_mysql.sh script cp -f scripts/mysql/*.sql /home/darilion/software/sip-router-git-repo/debian/ser/usr/lib/ser/ # and fix path to the *.sql files in ser_mysql.sh script sed -i 's#DEFAULT_SCRIPT_DIR=.*#DEFAULT_SCRIPT_DIR="/usr/lib/ser/"#' \
/home/darilion/software/sip-router-git-repo/debian/ser/usr/sbin/ser_mysql.sh sed: can't read /home/darilion/software/sip-router-git-repo/debian/ser/usr/sbin/ser_mysql.sh: No such file or directory make[1]: *** [install] Error 2 make[1]: Leaving directory `/home/darilion/software/sip-router-git-repo' dpkg-buildpackage: failure: fakeroot debian/rules binary gave error exit status 2
cheers klaus
Attached patch fixes the problem - and also the db_flatstore overlap.
I hope someone with better git knowledge than me can apply the patch.
regards klaus
Klaus Darilion schrieb:
# install /etc/default/ser file mkdir -p /home/darilion/software/sip-router-git-repo/debian/ser/etc/default cp -f debian/ser.default /home/darilion/software/sip-router-git-repo/debian/ser/etc/default/ser # install the *.sql files for ser_mysql.sh script cp -f scripts/mysql/*.sql /home/darilion/software/sip-router-git-repo/debian/ser/usr/lib/ser/ # and fix path to the *.sql files in ser_mysql.sh script sed -i 's#DEFAULT_SCRIPT_DIR=.*#DEFAULT_SCRIPT_DIR="/usr/lib/ser/"#' \
/home/darilion/software/sip-router-git-repo/debian/ser/usr/sbin/ser_mysql.sh
sed: can't read /home/darilion/software/sip-router-git-repo/debian/ser/usr/sbin/ser_mysql.sh: No such file or directory make[1]: *** [install] Error 2 make[1]: Leaving directory `/home/darilion/software/sip-router-git-repo' dpkg-buildpackage: failure: fakeroot debian/rules binary gave error exit status 2
cheers klaus
sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
diff --git a/Makefile b/Makefile index e7b83d7..1853302 100644 --- a/Makefile +++ b/Makefile @@ -156,7 +156,7 @@ module_group_standard_dep=acc_db acc_radius auth_db auth_radius avp_db \ presence_b2b rls speeddial uri_db xcap xmlrpc
# For db use (db modules, excluding drivers) -module_group_db=acc_db auth_db avp_db db_ops db_flatstore db_text \ +module_group_db=acc_db auth_db avp_db db_ops db_text \ uri_db domain lcr msilo speeddial #dbtext (s) not migrated yet to the new db interface
diff --git a/pkg/debian/rules b/pkg/debian/rules index 289ec3e..3d708f3 100755 --- a/pkg/debian/rules +++ b/pkg/debian/rules @@ -179,10 +179,10 @@ install: build mkdir -p $(CURDIR)/debian/ser/etc/default cp -f debian/ser.default $(CURDIR)/debian/ser/etc/default/ser # install the *.sql files for ser_mysql.sh script - cp -f scripts/mysql/*.sql $(CURDIR)/debian/ser/usr/lib/ser/ + cp -f scripts/mysql/*.sql $(CURDIR)/debian/ser-mysql-module/usr/lib/ser/ # and fix path to the *.sql files in ser_mysql.sh script sed -i 's#DEFAULT_SCRIPT_DIR=.*#DEFAULT_SCRIPT_DIR="/usr/lib/ser/"#' \ - $(CURDIR)/debian/ser/usr/sbin/ser_mysql.sh + $(CURDIR)/debian/ser-mysql-module/usr/sbin/ser_mysql.sh # install advanced ser config file for ser-oob package mkdir -p $(CURDIR)/debian/ser-oob/etc/ser cp -f etc/sip-router-oob.cfg $(CURDIR)/debian/ser-oob/etc/ser/ser-oob.cfg
On Nov 06, 2009 at 14:33, Klaus Darilion klaus.mailinglists@pernau.at wrote:
Attached patch fixes the problem - and also the db_flatstore overlap.
I hope someone with better git knowledge than me can apply the patch.
Thanks, applied.
For reference this is what I did:
git checkout sr_3.0 # switch to my local sr_3.0 branch # because the patch was not in git format (did not contain the commit # message) I had to use plain old patch, instead of git-am. patch -p1 < make-deb-patch.txt
# I've generated 2 commits from the patch: git add Makefile git commit --author="Klaus Darilion ..." -s
git add pkg/debian/rules git commit --author="Klaus Darilion ..." -s
git push origin sr_3.0:sr_3.0 # failed because my local sr_3.0 branch was not up-to-date => # update before push-ing
git fetch origin; git pull --rebase origin sr_3.0 git push origin sr_3.0:sr_3.0
If you are commiting your own changes and not someone else's patch, you don't need to add --author and -s to git commit.
Andrei
-
Andrei Pelinescu-Onciul -
Klaus Darilion