Build system: Move template-based debian build into debian-template

We are going to want to introduce a real Debian source package build
system.  But that needs to contain a lot of things in debian/ which
ought not to appear in the .deb made by the existing ad-hoc `./build
debian' arrangements, which we want to keep so as not to unduly
disturb existing users.

So rename the whole debian/ directory to debian-template/ and change
all references in the build system.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
This commit is contained in:
Ian Jackson 2015-09-12 17:25:39 +00:00
parent 532083f474
commit ac0f074ff7
8 changed files with 17 additions and 17 deletions

4
.gitignore vendored
View File

@ -2,6 +2,6 @@
*.so *.so
lib*.so.* lib*.so.*
*~ *~
debian/wiringPi debian-template/wiringPi
debian/wiringpi-*.deb debian-template/wiringpi-*.deb
gpio/gpio gpio/gpio

6
build
View File

@ -77,15 +77,15 @@ fi
if [ x$1 = "xdebian" ]; then if [ x$1 = "xdebian" ]; then
here=`pwd` here=`pwd`
cd debian/wiringPi cd debian-template/wiringPi
rm -rf usr rm -rf usr
cd $here/wiringPi cd $here/wiringPi
make install-deb make install-deb
cd $here/devLib cd $here/devLib
make install-deb INCLUDE='-I. -I../wiringPi' make install-deb INCLUDE='-I. -I../wiringPi'
cd $here/gpio cd $here/gpio
make install-deb INCLUDE='-I../wiringPi -I../devLib' LDFLAGS=-L../debian/wiringPi/usr/lib make install-deb INCLUDE='-I../wiringPi -I../devLib' LDFLAGS=-L../debian-template/wiringPi/usr/lib
cd $here/debian cd $here/debian-template
fakeroot dpkg-deb --build wiringPi fakeroot dpkg-deb --build wiringPi
mv wiringPi.deb wiringpi-`cat $here/VERSION`-1.deb mv wiringPi.deb wiringpi-`cat $here/VERSION`-1.deb
exit exit

View File

@ -104,12 +104,12 @@ install-static: $(STATIC)
.PHONY: install-deb .PHONY: install-deb
install-deb: $(DYNAMIC) install-deb: $(DYNAMIC)
$Q echo "[Install Headers: deb]" $Q echo "[Install Headers: deb]"
$Q install -m 0755 -d ~/wiringPi/debian/wiringPi/usr/include $Q install -m 0755 -d ~/wiringPi/debian-template/wiringPi/usr/include
$Q install -m 0644 $(HEADERS) ~/wiringPi/debian/wiringPi/usr/include $Q install -m 0644 $(HEADERS) ~/wiringPi/debian-template/wiringPi/usr/include
$Q echo "[Install Dynamic Lib: deb]" $Q echo "[Install Dynamic Lib: deb]"
install -m 0755 -d ~/wiringPi/debian/wiringPi/usr/lib install -m 0755 -d ~/wiringPi/debian-template/wiringPi/usr/lib
install -m 0755 libwiringPiDev.so.$(VERSION) ~/wiringPi/debian/wiringPi/usr/lib/libwiringPiDev.so.$(VERSION) install -m 0755 libwiringPiDev.so.$(VERSION) ~/wiringPi/debian-template/wiringPi/usr/lib/libwiringPiDev.so.$(VERSION)
ln -sf ~/wiringPi/debian/wiringPi/usr/lib/libwiringPiDev.so.$(VERSION) ~/wiringPi/debian/wiringPi/usr/lib/libwiringPiDev.so ln -sf ~/wiringPi/debian-template/wiringPi/usr/lib/libwiringPiDev.so.$(VERSION) ~/wiringPi/debian-template/wiringPi/usr/lib/libwiringPiDev.so
.PHONY: uninstall .PHONY: uninstall
uninstall: uninstall:

View File

@ -81,8 +81,8 @@ install: gpio
.PHONY: install-deb .PHONY: install-deb
install-deb: gpio install-deb: gpio
$Q echo "[Install: deb]" $Q echo "[Install: deb]"
$Q install -m 0755 -d ~/wiringPi/debian/wiringPi/usr/bin $Q install -m 0755 -d ~/wiringPi/debian-template/wiringPi/usr/bin
$Q install -m 0755 gpio ~/wiringPi/debian/wiringPi/usr/bin $Q install -m 0755 gpio ~/wiringPi/debian-template/wiringPi/usr/bin
.PHONY: uninstall .PHONY: uninstall
uninstall: uninstall:

View File

@ -128,12 +128,12 @@ install-static: $(STATIC)
.PHONY: install-deb .PHONY: install-deb
install-deb: $(DYNAMIC) install-deb: $(DYNAMIC)
$Q echo "[Install Headers: deb]" $Q echo "[Install Headers: deb]"
$Q install -m 0755 -d ~/wiringPi/debian/wiringPi/usr/include $Q install -m 0755 -d ~/wiringPi/debian-template/wiringPi/usr/include
$Q install -m 0644 $(HEADERS) ~/wiringPi/debian/wiringPi/usr/include $Q install -m 0644 $(HEADERS) ~/wiringPi/debian-template/wiringPi/usr/include
$Q echo "[Install Dynamic Lib: deb]" $Q echo "[Install Dynamic Lib: deb]"
install -m 0755 -d ~/wiringPi/debian/wiringPi/usr/lib install -m 0755 -d ~/wiringPi/debian-template/wiringPi/usr/lib
install -m 0755 libwiringPi.so.$(VERSION) ~/wiringPi/debian/wiringPi/usr/lib/libwiringPi.so.$(VERSION) install -m 0755 libwiringPi.so.$(VERSION) ~/wiringPi/debian-template/wiringPi/usr/lib/libwiringPi.so.$(VERSION)
ln -sf ~/wiringPi/debian/wiringPi/usr/lib/libwiringPi.so.$(VERSION) ~/wiringPi/debian/wiringPi/usr/lib/libwiringPi.so ln -sf ~/wiringPi/debian-template/wiringPi/usr/lib/libwiringPi.so.$(VERSION) ~/wiringPi/debian-template/wiringPi/usr/lib/libwiringPi.so
.PHONY: uninstall .PHONY: uninstall
uninstall: uninstall: