.gitlab-ci.yml

@@ -3,55 +3,5 @@ include:
  - 'https://source.puri.sm/Librem5/librem5-ci/raw/master/librem5-pipeline-byzantium-jobs.yml'
 
 stages:
- - test
  - package
  - test-package
-
-variables:
-  FLASHDEPS: python3
-             python3-coloredlogs
-             python3-jenkins
-             python3-requests
-             python3-tqdm
-             python3-yaml
-  IMAGE: pureos/byzantium
-
-.tags: &tags
-  tags:
-    - librem5
-
-test:download:deb:
-  <<: *tags
-  stage: test
-  image: $IMAGE
-  before_script:
-    - export DEBIAN_FRONTEND=noninteractive
-    - apt-get -y update
-    - apt-get -y install $FLASHDEPS
-    - rm -rf output
-  script:
-    - scripts/librem5-flash-image --board librem5r4 --variant plain  --dist amber-phone --skip-flash --skip-cleanup --dir=download/
-    - ls -l download/librem5*.img download/flash_librem5*.lst  download/u-boot-librem5*.imx
-    - mkdir -p output/
-    - cp download/flash_*.lst output/
-    - rm -rf download
-  artifacts:
-    paths:
-      - output/
-
-test:download:pip:
-  <<: *tags
-  stage: test
-  image: $IMAGE
-  before_script:
-    - export DEBIAN_FRONTEND=noninteractive
-    - apt-get -y update
-    - apt-get -y install virtualenv python3-pip
-  script:
-    - virtualenv --python=python3 test-download
-    - source test-download/bin/activate
-    - pip install -r requirements.txt
-    - python3 scripts/librem5-flash-image --board librem5r4 --variant plain  --dist amber-phone --skip-flash --skip-cleanup --dir=download/
-    - ls -l download/librem5*.img download/flash_librem5*.lst  download/u-boot-librem5*.imx
-    - rm -rf download
-

Makefile

@@ -6,7 +6,6 @@ check:
 	flake8
 	shellcheck test_scripts/librem5-check
 	shellcheck usr/share/librem5/l5-shipme
-	$(MAKE) -C scripts/
 
 install:
 	mkdir -p $(DESTDIR)/etc/modules-load.d/

debian/changelog

+librem5-devkit-tools (0.0.19pureos1) byzantium; urgency=medium
+
+  * d/control: Depend on librem5-flash-image
+  * Don't install flashing scripts.
+    These were split out to a separate repo. Keep the scripts around but
+    don't install them in the package until all the docs got updated.
+    See https://source.puri.sm/Librem5/librem5-devkit-tools/-/issues/40
+
+ -- Guido Günther <agx@sigxcpu.org>  Thu, 12 Aug 2021 10:15:19 +0200
+
+librem5-devkit-tools (0.0.18pureos1) byzantium; urgency=medium
+
+  [ Dorota Czaplejewicz ]
+  * ci: Build arm64 package too
+
+  [ Evangelos Ribeiro Tzaras ]
+  * ci: drop --dist parameter to use the defaults
+
+  [ Angus Ainslie ]
+  * librem5-devkit.conf: set the operating mode to bluetooth EDR
+
+ -- Angus <angus@midas.akkea.ca>  Mon, 09 Aug 2021 05:57:39 -0700
+
 librem5-devkit-tools (0.0.17pureos1) byzantium; urgency=medium
 
   * tests: Check for CSI controller

debian/clean

-debian/librem5-flash-image.1

debian/control

@@ -68,14 +68,7 @@ Replaces: librem5-devkit-host (<< 0.0.12)
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
- python3,
- python3-coloredlogs,
- python3-jenkins,
- python3-requests,
- python3-tqdm,
- python3-yaml,
- usbutils,
- uuu,
+ librem5-flash-image,
 Description: Tools for the librem5 and the Devkit (host side)
  Scripts useful to for working with the Librem 5 and the
  Librem 5 Devkit.

debian/librem5-host.install

-scripts/librem5*-flash-image /usr/bin/
 scripts/librem5-usbnet /usr/bin/

debian/librem5-host.librem5.udev

-SUBSYSTEM!="usb", GOTO="librem5_devkit_rules_end"
-# Devkit USB flash
-ATTR{idVendor}=="1fc9", ATTR{idProduct}=="012b", GROUP+="plugdev", TAG+="uaccess"
-ATTR{idVendor}=="0525", ATTR{idProduct}=="a4a5", GROUP+="plugdev", TAG+="uaccess"
-ATTR{idVendor}=="0525", ATTR{idProduct}=="b4a4", GROUP+="plugdev", TAG+="uaccess"
-ATTR{idVendor}=="316d", ATTR{idProduct}=="4c05", GROUP+="plugdev", TAG+="uaccess"
-LABEL="librem5_devkit_rules_end"

debian/librem5-host.manpages

-librem5-flash-image.1

debian/rules

@@ -5,9 +5,6 @@ include /usr/share/dpkg/default.mk
 %:
 	dh $@
 
-override_dh_installudev:
-	dh_installudev --name=librem5
-
 override_dh_installsystemd:
 	dh_installsystemd --no-start --name=resize_rootfs
 
@@ -18,9 +15,3 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 else
 	@echo "Checks disabled via DEB_BUILD_OPTIONS"
 endif
-
-override_dh_installman:
-	help2man -N --version-string=$(DEB_VERSION_UPSTREAM) \
-		--version-string=0.0.12 scripts/librem5-flash-image \
-		 > debian/tmp/librem5-flash-image.1
-	dh_installman

etc/modprobe.d/librem5-devkit.conf

@@ -4,12 +4,12 @@ options g_multi file=/var/lib/mass_storage_dummy stall=0
 blacklist rsi_91x
 blacklist rsi_sdio
 options rsi_91x load_flash_fw=1 feature_bitmap_9116=1 antenna_sel=3
-options rsi_sdio dev_oper_mode=13
+options rsi_sdio dev_oper_mode=5
 
 # blacklist vendor driver (redpine):
 # blacklist redpine_91x
 # blacklist redpine_sdio
-options redpine_91x dev_oper_mode=13 rsi_zone_enabled=1 antenna_diversity=1
+options redpine_91x dev_oper_mode=5 rsi_zone_enabled=1 antenna_diversity=1
 
 # blacklist magnetometer as long as we don't use it
 blacklist st_magn

scripts/Makefile

-check:
-	flake8 librem5-devkit-flash-image
-	python3 -m doctest librem5_flash_image.py
-