From 09a2e8374e5ca4abbcdc8b872244756ce774dab3 Mon Sep 17 00:00:00 2001 From: jcorgan Date: Tue, 14 Jul 2009 17:17:45 +0000 Subject: [PATCH] Reorganization of debian package directory git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11424 221aa14e-8319-0410-a670-987f0aec2ac5 --- .../bin/extract-install-filenames | 0 debian/{ => bin}/gen-install-files.sh | 2 +- debian/{ => bin}/install-build-deps.sh | 0 debian/{ => custom}/grc.conf | 0 debian/{ => custom}/libusrp.udev | 0 debian/{ => custom}/libusrp2.limits | 0 debian/{ => custom}/usrp.hotplug | 0 debian/rules | 12 ++++++------ usrp/fpga/toplevel/usrp_std/usrp_std.qsf | 9 ++++++--- 9 files changed, 13 insertions(+), 10 deletions(-) rename dtools/bin/extract_install_filenames => debian/bin/extract-install-filenames (100%) rename debian/{ => bin}/gen-install-files.sh (99%) rename debian/{ => bin}/install-build-deps.sh (100%) rename debian/{ => custom}/grc.conf (100%) rename debian/{ => custom}/libusrp.udev (100%) rename debian/{ => custom}/libusrp2.limits (100%) rename debian/{ => custom}/usrp.hotplug (100%) diff --git a/dtools/bin/extract_install_filenames b/debian/bin/extract-install-filenames similarity index 100% rename from dtools/bin/extract_install_filenames rename to debian/bin/extract-install-filenames diff --git a/debian/gen-install-files.sh b/debian/bin/gen-install-files.sh similarity index 99% rename from debian/gen-install-files.sh rename to debian/bin/gen-install-files.sh index ba690d02..ab04787c 100755 --- a/debian/gen-install-files.sh +++ b/debian/bin/gen-install-files.sh @@ -1,6 +1,6 @@ #!/bin/sh -EXTRACT=dtools/bin/extract_install_filenames +EXTRACT=debian/bin/extract-install-filenames # libusrp-dev NAME=debian/libusrp-dev.install diff --git a/debian/install-build-deps.sh b/debian/bin/install-build-deps.sh similarity index 100% rename from debian/install-build-deps.sh rename to debian/bin/install-build-deps.sh diff --git a/debian/grc.conf b/debian/custom/grc.conf similarity index 100% rename from debian/grc.conf rename to debian/custom/grc.conf diff --git a/debian/libusrp.udev b/debian/custom/libusrp.udev similarity index 100% rename from debian/libusrp.udev rename to debian/custom/libusrp.udev diff --git a/debian/libusrp2.limits b/debian/custom/libusrp2.limits similarity index 100% rename from debian/libusrp2.limits rename to debian/custom/libusrp2.limits diff --git a/debian/usrp.hotplug b/debian/custom/usrp.hotplug similarity index 100% rename from debian/usrp.hotplug rename to debian/custom/usrp.hotplug diff --git a/debian/rules b/debian/rules index 4f77b4a0..cc298e4c 100755 --- a/debian/rules +++ b/debian/rules @@ -46,7 +46,7 @@ configure-stamp: --disable-gr-audio-osx \ --disable-gr-audio-windows \ --disable-gcell --disable-gr-gcell \ - --disable-gr-comedi --disable-usrp2-firmware + --disable-gr-comedi touch configure-stamp build: build-stamp @@ -57,9 +57,9 @@ build-stamp: configure-stamp touch $@ extract: extract-stamp -extract-stamp: build-stamp debian/gen-install-files.sh +extract-stamp: build-stamp debian/bin/gen-install-files.sh dh_testdir - debian/gen-install-files.sh + debian/bin/gen-install-files.sh touch $@ install: install-stamp @@ -79,15 +79,15 @@ install-stamp: extract-stamp debian/control done : # Deposit rule to allow group 'usrp' access to USRP hardware - install -m 0644 -D debian/libusrp.udev \ + install -m 0644 -D debian/custom/libusrp.udev \ debian/tmp/etc/udev/rules.d/40-usrp.rules : # Deposit rule to allow group 'usrp' access to USRP2 hardware - install -m 0644 -D debian/libusrp2.limits \ + install -m 0644 -D debian/custom/libusrp2.limits \ debian/tmp/etc/security/limits.d/libusrp2.limits : # Install custom grc.conf - install -m 0644 -D debian/grc.conf \ + install -m 0644 -D debian/custom/grc.conf \ debian/tmp/etc/gnuradio/conf.d/grc.conf dh_install --sourcedir=debian/tmp diff --git a/usrp/fpga/toplevel/usrp_std/usrp_std.qsf b/usrp/fpga/toplevel/usrp_std/usrp_std.qsf index e0bac489..2ef4727e 100644 --- a/usrp/fpga/toplevel/usrp_std/usrp_std.qsf +++ b/usrp/fpga/toplevel/usrp_std/usrp_std.qsf @@ -27,7 +27,7 @@ # ======================== set_global_assignment -name ORIGINAL_QUARTUS_VERSION 3.0 set_global_assignment -name PROJECT_CREATION_TIME_DATE "00:14:04 JULY 13, 2003" -set_global_assignment -name LAST_QUARTUS_VERSION "7.1 SP1" +set_global_assignment -name LAST_QUARTUS_VERSION 8.1 # Pin & Location Assignments # ========================== @@ -368,7 +368,7 @@ set_instance_assignment -name CLOCK_SETTINGS master_clk -to master_clk # end ENTITY(usrp_std) # -------------------- -set_instance_assignment -name PARTITION_HIERARCHY no_file_for_top_partition -to | -section_id Top +set_instance_assignment -name PARTITION_HIERARCHY root_partition -to | -section_id Top set_global_assignment -name PARTITION_NETLIST_TYPE SOURCE -section_id Top set_global_assignment -name VERILOG_FILE ../../megacells/fifo_4k_18.v set_global_assignment -name VERILOG_FILE ../../sdr_lib/atr_delay.v @@ -406,4 +406,7 @@ set_global_assignment -name VERILOG_FILE usrp_std.v set_global_assignment -name VERILOG_FILE ../../sdr_lib/clk_divider.v set_global_assignment -name VERILOG_FILE ../../sdr_lib/serial_io.v set_global_assignment -name VERILOG_FILE ../../sdr_lib/strobe_gen.v -set_global_assignment -name VERILOG_FILE ../../sdr_lib/sign_extend.v \ No newline at end of file +set_global_assignment -name VERILOG_FILE ../../sdr_lib/sign_extend.v +set_global_assignment -name PARTITION_COLOR 16764057 -section_id Top +set_global_assignment -name LL_ROOT_REGION ON -section_id "Root Region" +set_global_assignment -name LL_MEMBER_STATE LOCKED -section_id "Root Region" \ No newline at end of file -- 2.30.2