diff --git a/usbboot/debian/.gitignore b/debian/.gitignore similarity index 100% rename from usbboot/debian/.gitignore rename to debian/.gitignore diff --git a/usbboot/debian/README.source b/debian/README.source similarity index 91% rename from usbboot/debian/README.source rename to debian/README.source index d06590f..6163fd4 100644 --- a/usbboot/debian/README.source +++ b/debian/README.source @@ -1,7 +1,7 @@ This Debian package is developed in a Git repository (see the Vcs-Git field of debian/control). To build from a git checkout: - debian/rules get-orig-source REPO=.. BRANCH=remotes/origin/master + debian/rules get-orig-source REPO=. BRANCH=remotes/origin/master mv xburst-tools_*.tar.gz .. debian/autogen.sh debuild diff --git a/usbboot/debian/autogen.sh b/debian/autogen.sh similarity index 68% rename from usbboot/debian/autogen.sh rename to debian/autogen.sh index 1556b17..31d0bc2 100755 --- a/usbboot/debian/autogen.sh +++ b/debian/autogen.sh @@ -12,5 +12,6 @@ dpkg-parsechangelog --format rfc822 --all | awk -f debian/changelog.upstream.awk debian/rules firmware -cp -f xburst_stage1/xburst_stage1.bin debian/ -cp -f xburst_stage2/xburst_stage2.bin debian/ +cp -f usbboot/xburst_stage1/xburst_stage1.bin debian/ +cp -f usbboot/xburst_stage2/xburst_stage2.bin debian/ +cp -f xbboot/target-stage1/stage1.bin debian/ diff --git a/usbboot/debian/changelog b/debian/changelog similarity index 100% rename from usbboot/debian/changelog rename to debian/changelog diff --git a/usbboot/debian/changelog.upstream.awk b/debian/changelog.upstream.awk similarity index 100% rename from usbboot/debian/changelog.upstream.awk rename to debian/changelog.upstream.awk diff --git a/usbboot/debian/clean.sh b/debian/clean.sh similarity index 100% rename from usbboot/debian/clean.sh rename to debian/clean.sh diff --git a/usbboot/debian/compat b/debian/compat similarity index 100% rename from usbboot/debian/compat rename to debian/compat diff --git a/usbboot/debian/control b/debian/control similarity index 100% rename from usbboot/debian/control rename to debian/control diff --git a/usbboot/debian/copyright b/debian/copyright similarity index 100% rename from usbboot/debian/copyright rename to debian/copyright diff --git a/usbboot/debian/dirs b/debian/dirs similarity index 100% rename from usbboot/debian/dirs rename to debian/dirs diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..5715281 --- /dev/null +++ b/debian/docs @@ -0,0 +1,2 @@ +usbboot/README.usbboot +xbboot/README.xbboot diff --git a/usbboot/debian/get-orig-source.sh b/debian/get-orig-source.sh similarity index 100% rename from usbboot/debian/get-orig-source.sh rename to debian/get-orig-source.sh diff --git a/usbboot/debian/rules b/debian/rules similarity index 88% rename from usbboot/debian/rules rename to debian/rules index 1989c81..96fcc5e 100755 --- a/usbboot/debian/rules +++ b/debian/rules @@ -11,7 +11,7 @@ override_dh_auto_clean: exit 1; \ } dh_auto_clean - sh debian/clean.sh + #sh debian/clean.sh override_dh_auto_configure: configure dh_auto_configure -- $(opt_optimize) $(opt_quiet) \ @@ -22,6 +22,7 @@ override_dh_auto_install: : install firmware from source package dh_install debian/xburst_stage1.bin usr/share/xburst-tools/ dh_install debian/xburst_stage2.bin usr/share/xburst-tools/ + dh_install debian/stage1.bin usr/share/xburst-tools/ override_dh_installchangelogs: dh_installchangelogs debian/changelog.upstream @@ -48,8 +49,11 @@ configure: configure.ac firmware: configure ./configure --enable-firmware - $(MAKE) -C src ../xburst_stage1/xburst_stage1.bin \ + $(MAKE) -C usbboot/src \ + ../xburst_stage1/xburst_stage1.bin \ ../xburst_stage2/xburst_stage2.bin + $(MAKE) -C xbboot/host-app \ + ../target-stage1/stage1.bin REPO = git://projects.qi-hardware.com/xburst-tools.git BRANCH = master diff --git a/usbboot/debian/source/format b/debian/source/format similarity index 100% rename from usbboot/debian/source/format rename to debian/source/format diff --git a/usbboot/debian/source/include-binaries b/debian/source/include-binaries similarity index 73% rename from usbboot/debian/source/include-binaries rename to debian/source/include-binaries index c02d77d..cfe0ab5 100644 --- a/usbboot/debian/source/include-binaries +++ b/debian/source/include-binaries @@ -1,2 +1,3 @@ debian/xburst_stage1.bin debian/xburst_stage2.bin +debian/stage1.bin diff --git a/debian/xburst-tools.manpages b/debian/xburst-tools.manpages new file mode 100644 index 0000000..0682bc9 --- /dev/null +++ b/debian/xburst-tools.manpages @@ -0,0 +1 @@ +./usbboot/doc/usbboot.1 diff --git a/usbboot/README b/usbboot/README.usbboot similarity index 100% rename from usbboot/README rename to usbboot/README.usbboot diff --git a/usbboot/debian/docs b/usbboot/debian/docs deleted file mode 100644 index e845566..0000000 --- a/usbboot/debian/docs +++ /dev/null @@ -1 +0,0 @@ -README diff --git a/usbboot/debian/xburst-tools.manpages b/usbboot/debian/xburst-tools.manpages deleted file mode 100644 index 6ba78e9..0000000 --- a/usbboot/debian/xburst-tools.manpages +++ /dev/null @@ -1 +0,0 @@ -./doc/usbboot.1 diff --git a/xbboot/README b/xbboot/README.xbboot similarity index 100% rename from xbboot/README rename to xbboot/README.xbboot