From eb7cb138248568a402cb9490f7ccfa2023866852 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Thu, 5 Dec 2019 22:46:19 -0700 Subject: [PATCH] update changelog for Debian build, elide accumulated patches --- debian/changelog | 191 +++++++++++++++++ ...nondeterminism-to-fix-JAR-timestamps.patch | 199 ------------------ debian/patches/elide-map-server.patch | 10 - debian/patches/fix-doc-versions.patch | 88 -------- debian/patches/initialize-byte-count.patch | 139 ------------ debian/patches/series | 4 - 6 files changed, 191 insertions(+), 440 deletions(-) delete mode 100644 debian/patches/0001-Use-strip-nondeterminism-to-fix-JAR-timestamps.patch delete mode 100644 debian/patches/elide-map-server.patch delete mode 100644 debian/patches/fix-doc-versions.patch delete mode 100644 debian/patches/initialize-byte-count.patch diff --git a/debian/changelog b/debian/changelog index 3181c766..84801358 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,194 @@ +altos (1.9.1-1) unstable; urgency=medium + + [ Bdale Garbee ] + * updates to Releasing based on 1.9 release process learnings + * doc: add flash-force instructions for TeleBT v3.0 + * doc: add force-bootloader instructions for TeleGPS v1 and v2 + * altos: add support for telefireeight-v2.0 + * altos: add telefireeight-v2.0 to src/Makefile and to Releasing + * Makefiles, too + * altos: add initial support for TeleFireOne v2.0 + * altos: ADS124S0X driver compiles with initialization code maybe completed + * altos: first cut of code for telefireone-v2.0 + * doc: new TeleLaunch system manual + * doc: actually add the telelaunch files + * altos: first cut at ADS124S0X driver interrupt handling + * altos: fix ads124s0x data structure + * altos: ADS124S0X driver compiles now + * altos: snapshot - working on ads124x0x driver + * altos: ads124s0x successfully reading data + * add an explicit reference to Poron open-cell foam in Appendix A + * ao-bringup: add a turnon_telefireeight script + * TeleFireEight has simple green LEDs for continuity + * doc: add more text to TeleLaunch manual, be less sloppy with dBm assertions + * doc: add some text to TeleLaunch troubleshooting about SAFE/ARM on TeleFire + * doc: add some text about cross-bank drag race safe/arm to TeleLaunch manual + * altosui: add monitor idle support for TeleMetrum v3 + * altosui: add TeleMetrum v3 to delivered firmware list + * altosuilib: TeleMetrum v3, like v2, doesn't use flash for config + * ao-bringup: add production test support for TeleMetrum v3.0 + * start the process of releasing 1.9.1 + * update release date in all documents + * update ChangeLog for 1.9.1 release + + [ Keith Packard ] + * doc: Update all docs to 1.9. Note this in doc/RELNOTES + * ao-tools: Add lots of compiler warning flags to ao-tools build + * ao-tools: Fix warnings in ao-tools + * ao-tools/ao-load: Return status from 'rewrite' + * ao-tools/ao-cal-accel: Initialize byte count var 'l' + * ao-tools/ao-telem: Print out 'log_max' value. Clean up compiler warnings. + * Remove ao-chaosread + * doc: Fix typo in TeleBT v3 flash-force instructions + * altos: Delete unused config bits for telefireeight-v2.0. Add Makefile + * altos/telefireeight-v2.0: Add flash loader Makefile + * Use strip-nondeterminism to fix JAR timestamps + * altos: Fix spelling of stm_dma_ch4_5_6_isr + * altos/stm: Note that ao_i2c_recv_dma_isr isn't actually used + * altos: Mark local functions 'static' + * altos: Declare all public functions in header files + * altos: Add 'void' to function declarations with no params. + * altos: Stop doing pointer arith on void * + * altos: Remove unused ao_adc_get from ao_adc_stm.c + * altos: Declare task stack as union of uint8_t and uint32_t + * altos: Add a pile more compiler warnings + * stm: Expose LCD font API in ao_lcd_font.h + * ao-bringup: chaosread is no longer part of altos + * ao-tools/ao-dump-up: Document --wait flag + * altos/stm-demo: Make this build again after various API and CFLAGS changes + * altos: Add -Wshadow to CFLAGS + * altos/attiny: Mark 'mode' param to ao_exti_setup_port as used + * altos: Move common build definitions to src/Makefile.defs + * altos: Remove AO_LOG_STATE from ao_log_telefiretwo + * altos/telefireone-v1.0: Doesn't have a beeper + * altos/telefireone-v1.0: Clean up Makefile + * altos/telefireone-v1.0: Turn off USE_INTERNAL_FLASH + * altos/telefireone-v1.0: Set AO_LOG_FORMAT + * altos/telefireone-v1.0: Set various ADC values + * altos/telefireone-v1.0: Track ao_led_init API change + * altos: Build telefireone-v1.0 by default + * altos/telefireone-v2.0: Remove build of ao_product.h from Makefile + * altos: Fix ISR declarations to make them non-weak + * altos: Allow applications to override newlib printf selection + * altos: Fix several mis-specified time types + * altos: Change default time type to 32-bits + * altos: add ao_time_ns API + * doc: A few minor edits to telelaunch docs + * altos/drivers/ao_led.c: Declare LED port as void * to allow any SoC to use this code + * altos: ARM ABI requires 8-byte aligned stack + * altos/stm32f4: Add -mfloat-abi=hard compile option + * altos/stm32f4: Need to read-back register after clock enable + * altos/stm32f4: Wrong value for CK48MSEL_PLL_Q + * altos/stm32f4: Working on USB + * altos/stm32f4-disco: Remove scheme + * doc: Document LEDs on TeleGPS devices + * doc: Make sure all 'code' examples are in DejaVu Sans Mono + * altos: Use ao_data_accel_invert when changing orientation value + * altoslib: Fetch correct mag along data for EasyMega v2 + * altoslib: Correct monitor idle IMU data for EasyMega v2 + * altos/lambdakey-v1.0: Fix obvious build errors + * altos: Work on MAX6691 driver + * altos: get ao_max6691 driver working + * altos/telefireone-v2.0: Definitions needed for MAX6691 driver + * altos: Add MAX6691 and ADS131A0X data to ring if present + * altos: Change MAX6691 driver to run its own thread + * altos/telefireone-v2.0: Include MAX6691 data in ring + * altos: Add preliminary TeleStatic v3.0 code + * Add TeleStatic-v3.0 makefiles + * altos: Directly compute radio tuning values from frequency + * doc: Describe what sunlight does to MicroPeak and how to protect it + * altosui: Ship EasyMini v2.0 firwmare + * doc: Say 'thousands of feet' instead of '3000-4000 feet' + * altos: Support ao_ms5607_dump when no ms5607 task + * altos/micropeak-v2.0: Don't run flight code when plugged in + * altos/micropeak-v2.0: Wait for the power supply to stabilize before measuring + * altos/micropeak-v2.0: Fix LED blinking sequence at power-on + * altos/micropeak-v2.0: Go into standby mode after landing + * altoslib: Always create an ordered record set for eeprom files + * altosui/telegps: Display error message when attempting to graph unknown files + * altos/micropeak-v2.0: expose log and config commands over USB + * altoslib: Add support for MicroPeak v2 eeprom format + * altos: Don't dump MS5607 eeprom in 'B' command + * altos/micropeak-v2: Erase log space at end of BOOST_DELAY + * altos/micropeak-v2: Correct AO_LOG_ID value + * altos/micropeak-v2: Update .gitignore + * ao-tools: Change ao-eeprom into eeprom analysis tool + * altos: Allow ms5607 driver to either set ao_sensor_errors or panic + * ao-tools/ao-telem: Fix man page and usage to match code + * ao-tools/lib: Add atmosphere model + * ao-tools/ao-eeprom: Add altitude data for baro values + * altosuilib: Don't crash when flashing an unknown device + * icon: Add altosdroid-specific icon + * altos/stmf0: Leave power interface disabled until needed + * altos/stmf0: Add 'ao_serial_shutdown' + * altos/stmf0: Allow SPI to be powered down when idle if desired + * altos/micropeak-v2.0: Reduce power usage + * altos: Record all failed sensors and report status at power up + * ao-tools/ao-eeprom: Add support for TeleFireTwo + * altoslib: Stop using deprecated Java functionality + * Use discovered java path for compiler and jni include files + * altosdroid: Hack up build to 'work' for now + * altosui: Fix path to easymini-v2.0 ihx file + * altosui: Make it possible to disable APRS + * altos: Use fast timer for buttons instead of edge-triggered ISR + * debian: Add libjson-c4 dependency + * Add new altosdroid icon + * icon: Ignore generated LED images + * Add .gitignore files for new projects + * libaltos: gitignore btletest + * altosui: Display data for point nearest cursor in map view + * altosui: Add speed and gps height to map display data + * drivers: Use 'main_value' instead of 'main' + * altos: Replace ao_xmem functions with direct mem calls + * altos: Add bmx160 driver + * altos: Integrate BMX160 into data code + * altos: Add EasyMega v3.0 bits (not setup correctly yet) + * altos: Add missing build files for avr/attiny devices + * altosdroid: Update Makefile.am to run gradle-based build + * altos: Switch all main() to return 'int' + * altos: Rename 'log' in ao_log_fireone to 'ao_fireone_data' + * doc: Describe new 'show nearest values' in map view + * doc: Update for 1.9.1 + * altoslib: Don't crash when map flight data is missing + * telegps: Get --graph mode working after recent changes + * altos/telefire: Don't arm the box if the local arm switch is off + * altos/test: Get test code working again after restructuring + * altosdroid: Make altosdroid code more resilient to weird androidisms + * altoslib: Don't bother adding FREETTS to CLASSPATH + * altos: Relabel packet receive status line for TeleFire boxes + * altos: Improve labeling of telefire receive packet information + * altoslib: Fix setting of CLASSPATH + * altoslib: Fix original telemetry sensor packet parsing + * altos: TeleMetrum v3.0 has ADXL375 and Max-8Q + * altoslib: Set up adxl375 for TM v3.0 in idle mode + * altos: Send "metrum" telemetry packets for TeleMetrum v3.0 boards + * ao-telem: Show all 24 bits of GPS altitude data + * doc: Mention TeleMetrum v3.0 in release notes for 1.9.1 + * doc: Update docs to reference TeleMetrum v3 where appropriate + * altoslib: Linker script changed -> the USB desc is two bytes off + * altosuilib: Show the recovered product name in the Configure Rom dialog + * altosuilib: Wait for Windows to get ready with new device + * Release note about self-flashing on windows waiting for devices + + [ Mike Beattie ] + * Remove ant build files + * Move java source, and resources to new paths for gradle + * Update files that reference new paths + * Add gradle build files + * buildinfo data comes from Makedefs now, not Version + * Clean up duplication in AndroidManifest.xml.in + * Remove versioning data from AndroidManifest.xml.in + * Add FOREGROUND_SERVICE permission which is now required + * Indentation cleanup + * Commented out duplicate strings + * Import cleanup + * Convert to AndroidX from support_v4 + * Update persistent notification in TelemetryService + * Update Google Maps API usage. + * Update app to use Material Design Light theme + + -- Bdale Garbee Thu, 05 Dec 2019 22:45:45 -0700 + altos (1.9-3) unstable; urgency=medium * cherry-pick commit that makes builds reproducible diff --git a/debian/patches/0001-Use-strip-nondeterminism-to-fix-JAR-timestamps.patch b/debian/patches/0001-Use-strip-nondeterminism-to-fix-JAR-timestamps.patch deleted file mode 100644 index 1f9d7253..00000000 --- a/debian/patches/0001-Use-strip-nondeterminism-to-fix-JAR-timestamps.patch +++ /dev/null @@ -1,199 +0,0 @@ -From 630f457666b48321be0a5b6fbf391efef1fa3eb4 Mon Sep 17 00:00:00 2001 -From: Keith Packard -Date: Sun, 3 Feb 2019 12:48:45 -0800 -Subject: [PATCH] Use strip-nondeterminism to fix JAR timestamps - -.jar files are just zip files, and contain dates. These will cause the -build to be non-reproducible. Use strip-nondeterminism to smash all of -these back to a fixed value. - -Signed-off-by: Keith Packard ---- - altoslib/Makefile.am | 3 +++ - altosui/Makefile.am | 6 ++++++ - altosuilib/Makefile.am | 3 +++ - configure.ac | 20 ++++++++++++++++++++ - map-server/altos-mapd/Makefile.am | 6 ++++++ - map-server/altos-mapj/Makefile.am | 6 ++++++ - micropeak/Makefile.am | 6 ++++++ - telegps/Makefile.am | 6 ++++++ - 8 files changed, 56 insertions(+) - -diff --git a/altoslib/Makefile.am b/altoslib/Makefile.am -index 447830e5..dfae0f69 100644 ---- a/altoslib/Makefile.am -+++ b/altoslib/Makefile.am -@@ -207,3 +207,6 @@ bin: - - $(JAR): classaltoslib.stamp - jar cf $@ -C bin org -+if STRIP_NONDETERMINISM -+ $(STRIP_NONDETERMINISM) $@ -+endif -diff --git a/altosui/Makefile.am b/altosui/Makefile.am -index 7cc1f4ea..eec15786 100644 ---- a/altosui/Makefile.am -+++ b/altosui/Makefile.am -@@ -255,12 +255,18 @@ $(JAR): classaltosui.stamp Manifest.txt $(JAVA_ICONS) $(ALTOSLIB_CLASS) $(ALTOSU - $(ICONJAR) \ - -C classes altosui \ - -C ../libaltos libaltosJNI -+if STRIP_NONDETERMINISM -+ $(STRIP_NONDETERMINISM) $@ -+endif - - $(FATJAR): classaltosui.stamp Manifest-fat.txt $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) $(JAVA_ICONS) - jar cfm $@ Manifest-fat.txt \ - $(ICONJAR) \ - -C classes altosui \ - -C ../libaltos libaltosJNI -+if STRIP_NONDETERMINISM -+ $(STRIP_NONDETERMINISM) $@ -+endif - - Manifest.txt: Makefile - echo 'Main-Class: altosui.AltosUI' > $@ -diff --git a/altosuilib/Makefile.am b/altosuilib/Makefile.am -index c00144f8..3b2e49d4 100644 ---- a/altosuilib/Makefile.am -+++ b/altosuilib/Makefile.am -@@ -101,3 +101,6 @@ $(JAVAROOT): - - $(JAR): classaltosuilib.stamp $(ICONS) - jar cf $@ $(ICONJAR) -C $(JAVAROOT) . -+if STRIP_NONDETERMINISM -+ $(STRIP_NONDETERMINISM) $@ -+endif -diff --git a/configure.ac b/configure.ac -index 466f5369..a2d84ce6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -395,6 +395,25 @@ if test "x$HAVE_ASCIIDOCTOR_PDF" = "xno"; then - fi - AM_CONDITIONAL([ASCIIDOCTOR_PDF], [test x$HAVE_ASCIIDOCTOR_PDF != xno]) - -+AC_ARG_WITH([strip-nondeterminism], -+ [AS_HELP_STRING([--with-strip-nondeterminism], -+ [Name of non-deterministic build data stripping tool])], -+ [], -+ [with_strip_nondeterminism=auto]) -+ -+if test "x$with_strip_nondeterminism" != "xno"; then -+ if test "x$with_strip_nondeterminism" = "xauto"; then -+ with_strip_nondeterminism="strip-nondeterminism" -+ AC_CHECK_PROG([HAVE_STRIP_NONDETERMINISM],[$with_strip_nondeterminism], yes, no) -+ else -+ HAVE_STRIP_NONDETERMINISM=yes -+ fi -+else -+ HAVE_STRIP_NONDETERMINISM=no -+fi -+AM_CONDITIONAL([STRIP_NONDETERMINISM], [test x$HAVE_STRIP_NONDETERMINISM != xno]) -+AC_SUBST(STRIP_NONDETERMINISM, "$with_strip_nondeterminism") -+ - PKG_CHECK_MODULES([JANSSON], [jansson]) - - AC_ARG_WITH([readline], -@@ -572,6 +591,7 @@ echo " STlink support..............: ${HAVE_STLINK}" - echo " Newlib-nano support.........: ${NEWLIB_NANO}" - echo " i386 and amd64 libaltos.....: ${MULTI_ARCH}" - echo " install shared mime info....: ${INSTALL_SHARED_MIME_INFO}" -+echo " Strip jar timestamps........: ${STRIP_NONDETERMINISM}" - echo "" - echo " Java" - echo " freetts.....................: ${FREETTS}" -diff --git a/map-server/altos-mapd/Makefile.am b/map-server/altos-mapd/Makefile.am -index 39f67536..315a33d5 100644 ---- a/map-server/altos-mapd/Makefile.am -+++ b/map-server/altos-mapd/Makefile.am -@@ -42,12 +42,18 @@ classes/altosmapd: - $(JAR): classaltosmapd.stamp Manifest.txt $(ALTOSLIB_CLASS) - jar cfm $@ Manifest.txt \ - -C classes altosmapd -+if STRIP_NONDETERMINISM -+ $(STRIP_NONDETERMINISM) $@ -+endif - - altosmapddir=$(datadir)/java - - $(FATJAR): classaltosmapd.stamp Manifest-fat.txt $(ALTOSLIB_CLASS) - jar cfm $@ Manifest-fat.txt \ - -C classes altosmapd -+if STRIP_NONDETERMINISM -+ $(STRIP_NONDETERMINISM) $@ -+endif - - altos-mapd: Makefile - echo "#!/bin/sh" > $@ -diff --git a/map-server/altos-mapj/Makefile.am b/map-server/altos-mapj/Makefile.am -index f447adb6..98d4f170 100644 ---- a/map-server/altos-mapj/Makefile.am -+++ b/map-server/altos-mapj/Makefile.am -@@ -31,12 +31,18 @@ classes/altosmap: - $(JAR): classaltosmap.stamp Manifest.txt $(ALTOSLIB_CLASS) - jar cfm $@ Manifest.txt \ - -C classes altosmap -+if STRIP_NONDETERMINISM -+ $(STRIP_NONDETERMINISM) $@ -+endif - - altosmapdir=$(datadir)/java - - $(FATJAR): classaltosmap.stamp Manifest-fat.txt $(ALTOSLIB_CLASS) - jar cfm $@ Manifest-fat.txt \ - -C classes altosmap -+if STRIP_NONDETERMINISM -+ $(STRIP_NONDETERMINISM) $@ -+endif - - altos-mapj: Makefile - echo "#!/bin/sh" > $@ -diff --git a/micropeak/Makefile.am b/micropeak/Makefile.am -index f01c5c9f..7e9b490d 100644 ---- a/micropeak/Makefile.am -+++ b/micropeak/Makefile.am -@@ -222,12 +222,18 @@ $(JAR): classmicropeak.stamp Manifest.txt $(JAVA_ICONS) $(ALTOSLIB_CLASS) $(ALTO - $(ICONJAR) \ - -C classes org \ - -C ../libaltos libaltosJNI -+if STRIP_NONDETERMINISM -+ $(STRIP_NONDETERMINISM) $@ -+endif - - $(FATJAR): classmicropeak.stamp Manifest-fat.txt $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(JAVA_ICONS) - jar cfm $@ Manifest-fat.txt \ - $(ICONJAR) \ - -C classes org \ - -C ../libaltos libaltosJNI -+if STRIP_NONDETERMINISM -+ $(STRIP_NONDETERMINISM) $@ -+endif - - classaltosui.stamp: $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) - -diff --git a/telegps/Makefile.am b/telegps/Makefile.am -index 3443b288..ae1e83e9 100644 ---- a/telegps/Makefile.am -+++ b/telegps/Makefile.am -@@ -227,12 +227,18 @@ $(JAR): classtelegps.stamp Manifest.txt $(JAVA_ICONS) $(ALTOSLIB_CLASS) $(ALTOSU - $(ICONJAR) \ - -C classes org \ - -C ../libaltos libaltosJNI -+if STRIP_NONDETERMINISM -+ $(STRIP_NONDETERMINISM) $@ -+endif - - $(FATJAR): classtelegps.stamp Manifest-fat.txt $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(JAVA_ICONS) - jar cfm $@ Manifest-fat.txt \ - $(ICONJAR) \ - -C classes org \ - -C ../libaltos libaltosJNI -+if STRIP_NONDETERMINISM -+ $(STRIP_NONDETERMINISM) $@ -+endif - - libaltos.so: build-libaltos - -rm -f "$@" --- -2.20.1 - diff --git a/debian/patches/elide-map-server.patch b/debian/patches/elide-map-server.patch deleted file mode 100644 index d0310325..00000000 --- a/debian/patches/elide-map-server.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 89fdd6c9..4f47417e 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,4 +1,4 @@ --SUBDIRS=ao-tools src doc icon altoslib libaltos altosuilib altosui micropeak ao-utils altosdroid telegps map-server -+SUBDIRS=ao-tools src doc icon altoslib libaltos altosuilib altosui micropeak ao-utils altosdroid telegps - - EXTRA_DIST = ChangeLog - diff --git a/debian/patches/fix-doc-versions.patch b/debian/patches/fix-doc-versions.patch deleted file mode 100644 index b4ec2435..00000000 --- a/debian/patches/fix-doc-versions.patch +++ /dev/null @@ -1,88 +0,0 @@ -From adf4bec88df1822031e1a8b00422de8b8b0c0cd4 Mon Sep 17 00:00:00 2001 -From: Keith Packard -Date: Wed, 2 Jan 2019 23:51:58 -0800 -Subject: [PATCH] doc: Update all docs to 1.9. Note this in doc/RELNOTES - -Missed a bunch of 1.8.7 numbers due to a missing step in the release process - -Signed-off-by: Keith Packard ---- - doc/RELNOTES | 8 ++++++++ - doc/easymini.txt | 2 +- - doc/micropeak.txt | 2 +- - doc/telegps.txt | 2 +- - doc/telemetry.txt | 2 +- - 5 files changed, 12 insertions(+), 4 deletions(-) - -diff --git a/doc/RELNOTES b/doc/RELNOTES -index db81297c..bd47f0b2 100644 ---- a/doc/RELNOTES -+++ b/doc/RELNOTES -@@ -13,6 +13,14 @@ Creating documentation for a new release of AltOS - easymini-release-notes.inc - telegps-release-notes.inc - -+* Update version in main docs -+ -+ altusmetrum.txt -+ easymini.txt -+ micropeak.txt -+ telegps.txt -+ telemetry.txt -+ - * Add release-notes-${version}.inc to git - - * Make sure new hardware specs are documented in specs.inc -diff --git a/doc/easymini.txt b/doc/easymini.txt -index e3d3fae8..69902f91 100644 ---- a/doc/easymini.txt -+++ b/doc/easymini.txt -@@ -1,7 +1,7 @@ - = EasyMini Owner's Manual - Keith Packard ; Bdale Garbee - :title-logo-image: image:../themes/background.png[] --:revnumber: v1.8.7 -+:revnumber: v1.9 - :revdate: 8 Oct 2018 - :copyright: Bdale Garbee and Keith Packard 2018 - :doctype: book -diff --git a/doc/micropeak.txt b/doc/micropeak.txt -index 9569194e..3621a2dc 100644 ---- a/doc/micropeak.txt -+++ b/doc/micropeak.txt -@@ -1,6 +1,6 @@ - = MicroPeak Owner's Manual - Keith Packard ; Bdale Garbee --:revnumber: v1.8.7 -+:revnumber: v1.9 - :revdate: 8 Oct 2018 - :copyright: Bdale Garbee and Keith Packard 2018 - :stylesheet: am.css -diff --git a/doc/telegps.txt b/doc/telegps.txt -index 8b558dbd..b28573cb 100644 ---- a/doc/telegps.txt -+++ b/doc/telegps.txt -@@ -1,7 +1,7 @@ - = TeleGPS Owner's Manual - Keith Packard ; Bdale Garbee - :title-logo-image: image:../themes/background.png[] --:revnumber: v1.8.7 -+:revnumber: v1.9 - :revdate: 8 Oct 2018 - :revremark: Fix TeleBT v4.0 RF calibration to factory value when reflashing. Fix map images. Fix Mac OS X support. - :copyright: Bdale Garbee and Keith Packard 2018 -diff --git a/doc/telemetry.txt b/doc/telemetry.txt -index ae9c7f9f..e1f25bf7 100644 ---- a/doc/telemetry.txt -+++ b/doc/telemetry.txt -@@ -1,6 +1,6 @@ - = AltOS Telemetry - Keith Packard ; Bdale Garbee --:revnumber: v1.8.7 -+:revnumber: v1.9 - :revdate: 8 Oct 2018 - :copyright: Bdale Garbee and Keith Packard 2018 - :stylesheet: am.css --- -2.20.1 - diff --git a/debian/patches/initialize-byte-count.patch b/debian/patches/initialize-byte-count.patch deleted file mode 100644 index 42c77667..00000000 --- a/debian/patches/initialize-byte-count.patch +++ /dev/null @@ -1,139 +0,0 @@ -From 14900d539c9d379a39ec157bb7e1914aad8fde3c Mon Sep 17 00:00:00 2001 -From: Keith Packard -Date: Thu, 3 Jan 2019 11:57:42 -0800 -Subject: [PATCH] ao-tools/ao-cal-accel: Initialize byte count var 'l' - -When left uninitialized, the program would randomly segfault at startup. - -Signed-off-by: Keith Packard ---- - ao-tools/ao-cal-accel/ao-cal-accel.c | 62 +++------------------------- - 1 file changed, 5 insertions(+), 57 deletions(-) - -diff --git a/ao-tools/ao-cal-accel/ao-cal-accel.c b/ao-tools/ao-cal-accel/ao-cal-accel.c -index 8a9e6347..671e4ba5 100644 ---- a/ao-tools/ao-cal-accel/ao-cal-accel.c -+++ b/ao-tools/ao-cal-accel/ao-cal-accel.c -@@ -48,35 +48,13 @@ static void usage(char *program) - exit(1); - } - --void -+static void - done(struct cc_usb *cc, int code) - { - cc_usb_close(cc); - exit (code); - } - --static int --ends_with(char *whole, char *suffix) --{ -- int whole_len = strlen(whole); -- int suffix_len = strlen(suffix); -- -- if (suffix_len > whole_len) -- return 0; -- return strcmp(whole + whole_len - suffix_len, suffix) == 0; --} -- --static int --starts_with(char *whole, char *prefix) --{ -- int whole_len = strlen(whole); -- int prefix_len = strlen(prefix); -- -- if (prefix_len > whole_len) -- return 0; -- return strncmp(whole, prefix, prefix_len) == 0; --} -- - static char ** - tok(char *line) { - char **strs = malloc (sizeof (char *)), *str; -@@ -92,16 +70,6 @@ tok(char *line) { - return strs; - } - --static void --free_strs(char **strs) { -- char *str; -- int i; -- -- for (i = 0; (str = strs[i]) != NULL; i++) -- free(str); -- free(strs); --} -- - struct flash { - struct flash *next; - char line[512]; -@@ -130,21 +98,8 @@ flash(struct cc_usb *usb) - return head; - } - --static void --free_flash(struct flash *b) { -- struct flash *n; -- -- while (b) { -- n = b->next; -- free_strs(b->strs); -- free(b); -- b = n; -- } --} -- --char ** -+static char ** - find_flash(struct flash *b, char *word0) { -- int i; - for (;b; b = b->next) { - if (strstr(b->line, word0)) - return b->strs; -@@ -152,7 +107,7 @@ find_flash(struct flash *b, char *word0) { - return NULL; - } - --void -+static void - await_key(void) - { - struct termios termios, termios_save; -@@ -166,12 +121,12 @@ await_key(void) - tcsetattr(0, TCSAFLUSH, &termios_save); - } - --int -+static int - do_cal(struct cc_usb *usb) { - struct flash *b; - char **accel; - char line[1024]; -- int l; -+ int l = 0; - int running = 0; - int worked = 1; - -@@ -230,18 +185,11 @@ int - main (int argc, char **argv) - { - char *device = NULL; -- char *filename; -- Elf *e; -- unsigned int s; -- int i; - int c; -- int tries; - struct cc_usb *cc = NULL; - char *tty = NULL; -- int success; - int verbose = 0; - int ret = 0; -- int expected_size; - - while ((c = getopt_long(argc, argv, "rT:D:c:s:v:", options, NULL)) != -1) { - switch (c) { --- -2.20.1 - diff --git a/debian/patches/series b/debian/patches/series index d84a60e1..e69de29b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +0,0 @@ -elide-map-server.patch -initialize-byte-count.patch -fix-doc-versions.patch -0001-Use-strip-nondeterminism-to-fix-JAR-timestamps.patch -- 2.47.2