bb-usb-gadgets (1.20240604.1)

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>

bb-usb-gadgets/suite/bookworm/debian/bb-boot

@@ -5,5 +5,8 @@
 # other values take no effect, and are ignored. The only expected value is "yes"
 ##USB_IMAGE_FILE_DISABLED=yes
 
+# USB_MTP_DISABLED=yes #disable the loading of the MTP client.
+USB_MTP_DISABLED=yes
+
 # Mainline Linux is removing RNDIS Support, NCM works in Windows 11...
 ##USB_RNDIS_DISABLED=yes

bb-usb-gadgets/suite/bookworm/debian/bb-start-acm-ncm-rndis-old-gadget

@@ -175,15 +175,17 @@ run_libcomposite () {
 		#echo /dev/nbd0 > functions/mass_storage.usb0/lun.0/file
 		#ln -s functions/mass_storage.usb0 configs/c.1/
 
-		#if [ -f /usr/bin/umtprd ] ; then
-		#	mkdir -p functions/ffs.mtp
-		#	ln -s functions/ffs.mtp configs/c.1
-
-		#	mkdir /dev/ffs-mtp
-		#	mount -t functionfs mtp /dev/ffs-mtp
-		#	/usr/bin/umtprd &
-		#	sleep 1
-		#fi
+		if [ ! "x${USB_MTP_DISABLED}" = "xyes" ]; then
+			if [ -f /usr/bin/umtprd ] ; then
+				mkdir -p functions/ffs.mtp
+				ln -s functions/ffs.mtp configs/c.1
+
+				mkdir /dev/ffs-mtp
+				mount -t functionfs mtp /dev/ffs-mtp
+				/usr/bin/umtprd &
+				sleep 1
+			fi
+		fi
 	fi
 
 	###FIXME:

bb-usb-gadgets/suite/bookworm/debian/changelog

-bb-usb-gadgets (1.20240604.0-0~bookworm+20240604) bookworm; urgency=low
+bb-usb-gadgets (1.20240604.1-0~bookworm+20240604) bookworm; urgency=low
 
   * Mainline linux is removing RNDIS support, in Debian 12/13 (Bookworm/Trixie), we default to only NCM usb0 which works in Windows 11
   * Automatically generate /etc/default/bb-mac-addr if file doesnt exist
 
- -- Robert Nelson <robertcnelson@gmail.com>  Tue, 04 Jun 2024 15:32:52 -0500
+ -- Robert Nelson <robertcnelson@gmail.com>  Tue, 04 Jun 2024 15:54:11 -0500
 

bb-usb-gadgets/suite/bullseye/debian/bb-boot

@@ -5,5 +5,8 @@
 # other values take no effect, and are ignored. The only expected value is "yes"
 ##USB_IMAGE_FILE_DISABLED=yes
 
+# USB_MTP_DISABLED=yes #disable the loading of the MTP client.
+USB_MTP_DISABLED=yes
+
 # Mainline Linux is removing RNDIS Support, NCM works in Windows 11...
 ##USB_RNDIS_DISABLED=yes

bb-usb-gadgets/suite/bullseye/debian/bb-start-acm-ncm-rndis-old-gadget

@@ -175,15 +175,17 @@ run_libcomposite () {
 		#echo /dev/nbd0 > functions/mass_storage.usb0/lun.0/file
 		#ln -s functions/mass_storage.usb0 configs/c.1/
 
-		#if [ -f /usr/bin/umtprd ] ; then
-		#	mkdir -p functions/ffs.mtp
-		#	ln -s functions/ffs.mtp configs/c.1
-
-		#	mkdir /dev/ffs-mtp
-		#	mount -t functionfs mtp /dev/ffs-mtp
-		#	/usr/bin/umtprd &
-		#	sleep 1
-		#fi
+		if [ ! "x${USB_MTP_DISABLED}" = "xyes" ]; then
+			if [ -f /usr/bin/umtprd ] ; then
+				mkdir -p functions/ffs.mtp
+				ln -s functions/ffs.mtp configs/c.1
+
+				mkdir /dev/ffs-mtp
+				mount -t functionfs mtp /dev/ffs-mtp
+				/usr/bin/umtprd &
+				sleep 1
+			fi
+		fi
 	fi
 
 	###FIXME:

bb-usb-gadgets/suite/bullseye/debian/changelog

-bb-usb-gadgets (1.20240604.0-0~bullseye+20240604) bullseye; urgency=low
+bb-usb-gadgets (1.20240604.1-0~bullseye+20240604) bullseye; urgency=low
 
   * Mainline linux is removing RNDIS support, in Debian 12/13 (Bookworm/Trixie), we default to only NCM usb0 which works in Windows 11
   * Automatically generate /etc/default/bb-mac-addr if file doesnt exist
 
- -- Robert Nelson <robertcnelson@gmail.com>  Tue, 04 Jun 2024 15:32:52 -0500
+ -- Robert Nelson <robertcnelson@gmail.com>  Tue, 04 Jun 2024 15:54:11 -0500
 

bb-usb-gadgets/suite/jammy/debian/bb-boot

@@ -5,5 +5,8 @@
 # other values take no effect, and are ignored. The only expected value is "yes"
 ##USB_IMAGE_FILE_DISABLED=yes
 
+# USB_MTP_DISABLED=yes #disable the loading of the MTP client.
+USB_MTP_DISABLED=yes
+
 # Mainline Linux is removing RNDIS Support, NCM works in Windows 11...
 ##USB_RNDIS_DISABLED=yes

bb-usb-gadgets/suite/jammy/debian/bb-start-acm-ncm-rndis-old-gadget

@@ -175,15 +175,17 @@ run_libcomposite () {
 		#echo /dev/nbd0 > functions/mass_storage.usb0/lun.0/file
 		#ln -s functions/mass_storage.usb0 configs/c.1/
 
-		#if [ -f /usr/bin/umtprd ] ; then
-		#	mkdir -p functions/ffs.mtp
-		#	ln -s functions/ffs.mtp configs/c.1
-
-		#	mkdir /dev/ffs-mtp
-		#	mount -t functionfs mtp /dev/ffs-mtp
-		#	/usr/bin/umtprd &
-		#	sleep 1
-		#fi
+		if [ ! "x${USB_MTP_DISABLED}" = "xyes" ]; then
+			if [ -f /usr/bin/umtprd ] ; then
+				mkdir -p functions/ffs.mtp
+				ln -s functions/ffs.mtp configs/c.1
+
+				mkdir /dev/ffs-mtp
+				mount -t functionfs mtp /dev/ffs-mtp
+				/usr/bin/umtprd &
+				sleep 1
+			fi
+		fi
 	fi
 
 	###FIXME:

bb-usb-gadgets/suite/jammy/debian/changelog

-bb-usb-gadgets (1.20240604.0-0~jammy+20240604) jammy; urgency=low
+bb-usb-gadgets (1.20240604.1-0~jammy+20240604) jammy; urgency=low
 
   * Mainline linux is removing RNDIS support, in Debian 12/13 (Bookworm/Trixie), we default to only NCM usb0 which works in Windows 11
   * Automatically generate /etc/default/bb-mac-addr if file doesnt exist
 
- -- Robert Nelson <robertcnelson@gmail.com>  Tue, 04 Jun 2024 15:32:52 -0500
+ -- Robert Nelson <robertcnelson@gmail.com>  Tue, 04 Jun 2024 15:54:11 -0500
 

bb-usb-gadgets/suite/noble/debian/bb-boot

@@ -5,5 +5,8 @@
 # other values take no effect, and are ignored. The only expected value is "yes"
 ##USB_IMAGE_FILE_DISABLED=yes
 
+# USB_MTP_DISABLED=yes #disable the loading of the MTP client.
+USB_MTP_DISABLED=yes
+
 # Mainline Linux is removing RNDIS Support, NCM works in Windows 11...
 USB_RNDIS_DISABLED=yes

bb-usb-gadgets/suite/noble/debian/bb-start-acm-ncm-rndis-old-gadget

@@ -175,15 +175,17 @@ run_libcomposite () {
 		#echo /dev/nbd0 > functions/mass_storage.usb0/lun.0/file
 		#ln -s functions/mass_storage.usb0 configs/c.1/
 
-		#if [ -f /usr/bin/umtprd ] ; then
-		#	mkdir -p functions/ffs.mtp
-		#	ln -s functions/ffs.mtp configs/c.1
-
-		#	mkdir /dev/ffs-mtp
-		#	mount -t functionfs mtp /dev/ffs-mtp
-		#	/usr/bin/umtprd &
-		#	sleep 1
-		#fi
+		if [ ! "x${USB_MTP_DISABLED}" = "xyes" ]; then
+			if [ -f /usr/bin/umtprd ] ; then
+				mkdir -p functions/ffs.mtp
+				ln -s functions/ffs.mtp configs/c.1
+
+				mkdir /dev/ffs-mtp
+				mount -t functionfs mtp /dev/ffs-mtp
+				/usr/bin/umtprd &
+				sleep 1
+			fi
+		fi
 	fi
 
 	###FIXME:

bb-usb-gadgets/suite/noble/debian/changelog

-bb-usb-gadgets (1.20240604.0-0~noble+20240604) noble; urgency=low
+bb-usb-gadgets (1.20240604.1-0~noble+20240604) noble; urgency=low
 
   * Mainline linux is removing RNDIS support, in Debian 12/13 (Bookworm/Trixie), we default to only NCM usb0 which works in Windows 11
   * Automatically generate /etc/default/bb-mac-addr if file doesnt exist
 
- -- Robert Nelson <robertcnelson@gmail.com>  Tue, 04 Jun 2024 15:32:52 -0500
+ -- Robert Nelson <robertcnelson@gmail.com>  Tue, 04 Jun 2024 15:54:11 -0500
 

bb-usb-gadgets/suite/trixie/debian/bb-boot

@@ -5,5 +5,8 @@
 # other values take no effect, and are ignored. The only expected value is "yes"
 ##USB_IMAGE_FILE_DISABLED=yes
 
+# USB_MTP_DISABLED=yes #disable the loading of the MTP client.
+USB_MTP_DISABLED=yes
+
 # Mainline Linux is removing RNDIS Support, NCM works in Windows 11...
 USB_RNDIS_DISABLED=yes

bb-usb-gadgets/suite/trixie/debian/bb-start-acm-ncm-rndis-old-gadget

@@ -175,15 +175,17 @@ run_libcomposite () {
 		#echo /dev/nbd0 > functions/mass_storage.usb0/lun.0/file
 		#ln -s functions/mass_storage.usb0 configs/c.1/
 
-		#if [ -f /usr/bin/umtprd ] ; then
-		#	mkdir -p functions/ffs.mtp
-		#	ln -s functions/ffs.mtp configs/c.1
-
-		#	mkdir /dev/ffs-mtp
-		#	mount -t functionfs mtp /dev/ffs-mtp
-		#	/usr/bin/umtprd &
-		#	sleep 1
-		#fi
+		if [ ! "x${USB_MTP_DISABLED}" = "xyes" ]; then
+			if [ -f /usr/bin/umtprd ] ; then
+				mkdir -p functions/ffs.mtp
+				ln -s functions/ffs.mtp configs/c.1
+
+				mkdir /dev/ffs-mtp
+				mount -t functionfs mtp /dev/ffs-mtp
+				/usr/bin/umtprd &
+				sleep 1
+			fi
+		fi
 	fi
 
 	###FIXME:

bb-usb-gadgets/suite/trixie/debian/changelog

-bb-usb-gadgets (1.20240604.0-0~trixie+20240604) trixie; urgency=low
+bb-usb-gadgets (1.20240604.1-0~trixie+20240604) trixie; urgency=low
 
   * Mainline linux is removing RNDIS support, in Debian 12/13 (Bookworm/Trixie), we default to only NCM usb0 which works in Windows 11
   * Automatically generate /etc/default/bb-mac-addr if file doesnt exist
 
- -- Robert Nelson <robertcnelson@gmail.com>  Tue, 04 Jun 2024 15:32:52 -0500
+ -- Robert Nelson <robertcnelson@gmail.com>  Tue, 04 Jun 2024 15:54:11 -0500
 

bb-usb-gadgets/version.sh

@@ -2,7 +2,7 @@
 
 package_name="bb-usb-gadgets"
 debian_pkg_name="${package_name}"
-package_version="1.20240604.0"
+package_version="1.20240604.1"
 package_source=""
 src_dir=""