mirror
/
wmbusmeters
kopia lustrzana https://github.com/weetmuts/wmbusmeters
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

More work on creating deb package.

pull/303/head
Fredrik Öhrström 2021-06-29 16:54:12 +02:00
rodzic 3fffa30188
commit b9d200f04f
6 zmienionych plików z 50 dodań i 27 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

9
Makefile
Wyświetl plik

@ -199,14 +199,17 @@ all: $(BUILD)/wmbusmeters $(BUILD)/wmbusmeters-admin $(BUILD)/testinternals
deb: wmbusmeters_$(DEBVERSION)_$(DEBARCH).deb deb: wmbusmeters_$(DEBVERSION)_$(DEBARCH).deb
check_deb:
lintian --no-tag-display-limit wmbusmeters_$(DEBVERSION)_$(DEBARCH).deb
check_docs: check_docs:
@cat src/cmdline.cc | grep -o -- '--[a-z][a-z]*' | sort | uniq | grep -v internaltesting > /tmp/options_in_code @cat src/cmdline.cc | grep -o -- '--[a-z][a-z]*' | sort | uniq | grep -v internaltesting > /tmp/options_in_code
@cat wmbusmeters.1 | grep -o -- '--[a-z][a-z]*' | sort | uniq | grep -v internaltesting > /tmp/options_in_man @cat wmbusmeters.1 | grep -o -- '--[a-z][a-z]*' | sort | uniq | grep -v internaltesting > /tmp/options_in_man
@cat README.md | grep -o -- '--[a-z][a-z]*' | sort | uniq | grep -v internaltesting > /tmp/options_in_readme @cat README.md | grep -o -- '--[a-z][a-z]*' | sort | uniq | grep -v internaltesting > /tmp/options_in_readme
@./build/wmbusmeters --help | grep -o -- '--[a-z][a-z]*' | sort | uniq | grep -v internaltesting > /tmp/options_in_binary @./build/wmbusmeters --help | grep -o -- '--[a-z][a-z]*' | sort | uniq | grep -v internaltesting > /tmp/options_in_binary
@diff /tmp/options_in_code /tmp/options_in_man @diff /tmp/options_in_code /tmp/options_in_man || echo CODE_VS_MAN
@diff /tmp/options_in_code /tmp/options_in_readme @diff /tmp/options_in_code /tmp/options_in_readme || echo CODE_VS_README
@diff /tmp/options_in_code /tmp/options_in_binary @diff /tmp/options_in_code /tmp/options_in_binary || echo CODE_VS_BINARY
@echo "OK docs" @echo "OK docs"
install: $(BUILD)/wmbusmeters check_docs install: $(BUILD)/wmbusmeters check_docs

2
README.md
Wyświetl plik

@ -535,7 +535,7 @@ corresponding meter files in wmbusmetrs' config directory.
You can also use the XMLExtract Java program. `javac utils/XMLExtract` You can also use the XMLExtract Java program. `javac utils/XMLExtract`
and then `java -cp utils XMLExtract` to print the key on the command line. and then `java -cp utils XMLExtract` to print the key on the command line.
You can run wmbusmeters with `--logtelegram`s to get log output that can You can run wmbusmeters with `--logtelegrams` to get log output that can
be placed in a simulation.txt file. You can then run wmbusmeter and be placed in a simulation.txt file. You can then run wmbusmeter and
instead of an usb device, you provide the `simulation.txt` file as instead of an usb device, you provide the `simulation.txt` file as
argument. See test.sh for more info. argument. See test.sh for more info.

5
deb/changelog 100644
Wyświetl plik

@ -0,0 +1,5 @@
wmbusmeters (1.3.0-1) stable; urgency=medium
* First package upload (Closes: #xxxxxx)
-- Fredrik Öhrström <oehrstroem@gmail.com> Sat, 26 Jun 2021 12:39:00 +0100

38
deb/create_deb.sh
Wyświetl plik

@ -32,24 +32,38 @@ fi
rm -rf $BUILD/debian/wmbusmeters rm -rf $BUILD/debian/wmbusmeters
mkdir -p $BUILD/debian/wmbusmeters/DEBIAN mkdir -p $BUILD/debian/wmbusmeters/DEBIAN
./install.sh $BUILD/wmbusmeters $BUILD/debian/wmbusmeters --no-adduser ./install.sh $BUILD/wmbusmeters $BUILD/debian/wmbusmeters --no-adduser
# Remove the conf files, they are to be installed by postinst. # Remove the conf and log files, they are to be installed by postinst.
rm $BUILD/debian/wmbusmeters/etc/wmbusmeters.conf rm $BUILD/debian/wmbusmeters/etc/wmbusmeters.conf
rm -rf $BUILD/debian/wmbusmeters/etc/wmbusmetersd rm -rf $BUILD/debian/wmbusmeters/etc/wmbusmetersd
rm -rf $BUILD/debian/wmbusmeters/var/log/wmbusmeters
# Build the control file # Build the control file
echo "Package: wmbusmeters" >> $BUILD/debian/wmbusmeters/DEBIAN/control cat >> $BUILD/debian/wmbusmeters/DEBIAN/control << EOF
echo "Version: $DEBVERSION" >> $BUILD/debian/wmbusmeters/DEBIAN/control Package: wmbusmeters
echo "Maintainer: Fredrik Öhrström <oehrstroemgmail.com>" >> $BUILD/debian/wmbusmeters/DEBIAN/control Version: $DEBVERSION
echo "Architecture: $DEBARCH" >> $BUILD/debian/wmbusmeters/DEBIAN/control Maintainer: Fredrik Öhrström <oehrstroem@gmail.com>
echo "Installed-Size: 1" >> $BUILD/debian/wmbusmeters/DEBIAN/control Architecture: $DEBARCH
echo "Depends: libc6 (>= 2.27)" >> $BUILD/debian/wmbusmeters/DEBIAN/control Installed-Size: $ISIZE
echo "Section: kernel" >> $BUILD/debian/wmbusmeters/DEBIAN/control Depends: libc6 (>= 2.27)
echo "Priority: optional" >> $BUILD/debian/wmbusmeters/DEBIAN/control Section: kernel
echo "Homepage: https://github.com/weetmuts/wmbusmeters" >> $BUILD/debian/wmbusmeters/DEBIAN/control Priority: optional
echo "Description: A tool to read wireless mbus telegrams from utility meters." >> $BUILD/debian/wmbusmeters/DEBIAN/control Homepage: https://github.com/weetmuts/wmbusmeters
Description: read wireless and wired mbus telegrams from utility meters
Wmbusmeters receives and decodes C1,T1 or S1 telegrams (using
the wireless or wired mbus protocol) to acquire utility meter
readings. The readings can then be published using MQTT,
curled to a REST api, inserted into a database or stored in a log file.
.
Installing this package results in a full installation, including the
configuration files and the daemon. Configuration files for an existing
installation are preserved.
EOF
cat >> $BUILD/debian/wmbusmeters/DEBIAN/conffiles << EOF
/etc/logrotate.d/wmbusmeters
EOF
mkdir -p $BUILD/debian/wmbusmeters/usr/share/doc/wmbusmeters mkdir -p $BUILD/debian/wmbusmeters/usr/share/doc/wmbusmeters
# Install the changelog # Install the changelog
cp deb/changelog $BUILD/debian/wmbusmeters/usr/share/doc/wmbusmeters/changelog.Debian cp deb/changelog $BUILD/debian/wmbusmeters/usr/share/doc/wmbusmeters/changelog.Debian
gzip -v9 $BUILD/debian/wmbusmeters/usr/share/doc/wmbusmeters/changelog.Debian gzip -v9 -n $BUILD/debian/wmbusmeters/usr/share/doc/wmbusmeters/changelog.Debian
# Collect copyright information # Collect copyright information
./deb/collect_copyrights.sh ./deb/collect_copyrights.sh
cp /tmp/copyright $BUILD/debian/wmbusmeters/usr/share/doc/wmbusmeters/copyright cp /tmp/copyright $BUILD/debian/wmbusmeters/usr/share/doc/wmbusmeters/copyright

2
scripts/install_binaries.sh
Wyświetl plik

@ -7,6 +7,6 @@ rm -f "$ROOT"/usr/bin/wmbusmeters "$ROOT"/usr/sbin/wmbusmetersd
mkdir -p "$ROOT"/usr/bin mkdir -p "$ROOT"/usr/bin
mkdir -p "$ROOT"/usr/sbin mkdir -p "$ROOT"/usr/sbin
cp "$SRC" "$ROOT"/usr/bin/wmbusmeters cp "$SRC" "$ROOT"/usr/bin/wmbusmeters
ln -s /usr/bin/wmbusmeters "$ROOT"/usr/sbin/wmbusmetersd (cd "$ROOT"/usr/sbin; ln -s ../bin/wmbusmeters wmbusmetersd)
echo "binaries: installed $ROOT/usr/bin/wmbusmeters and $ROOT/usr/sbin/wmbusmetersd" echo "binaries: installed $ROOT/usr/bin/wmbusmeters and $ROOT/usr/sbin/wmbusmetersd"

5
scripts/install_manpage.sh
Wyświetl plik

@ -5,6 +5,7 @@
rm -f "$ROOT"/usr/share/man/man1/wmbusmeters.1.gz rm -f "$ROOT"/usr/share/man/man1/wmbusmeters.1.gz
mkdir -p "$ROOT"/usr/share/man/man1 mkdir -p "$ROOT"/usr/share/man/man1
gzip -v9 -c wmbusmeters.1 > "$ROOT"/usr/share/man/man1/wmbusmeters.1.gz gzip -v9 -n -c wmbusmeters.1 > "$ROOT"/usr/share/man/man1/wmbusmeters.1.gz
(cd "$ROOT"/usr/share/man/man1; ln -s wmbusmeters.1.gz wmbusmetersd.1.gz)
echo "man page: installed $ROOT/usr/share/man/man1/wmbusmeters.1.gz" echo "man page: installed $ROOT/usr/share/man/man1/wmbusmeters.1.gz $ROOT/usr/share/man/man1/wmbusmetersd.1.gz"