diff --git a/base/ca-certificates/debian/meta_data.yaml b/base/ca-certificates/debian/bullseye/meta_data.yaml
similarity index 100%
rename from base/ca-certificates/debian/meta_data.yaml
rename to base/ca-certificates/debian/bullseye/meta_data.yaml
diff --git a/base/ca-certificates/debian/patches/0001-Remove-explicit-delete-while-update-CA-bundle.patch b/base/ca-certificates/debian/bullseye/patches/0001-Remove-explicit-delete-while-update-CA-bundle.patch
similarity index 100%
rename from base/ca-certificates/debian/patches/0001-Remove-explicit-delete-while-update-CA-bundle.patch
rename to base/ca-certificates/debian/bullseye/patches/0001-Remove-explicit-delete-while-update-CA-bundle.patch
diff --git a/base/ca-certificates/debian/patches/series b/base/ca-certificates/debian/bullseye/patches/series
similarity index 100%
rename from base/ca-certificates/debian/patches/series
rename to base/ca-certificates/debian/bullseye/patches/series
diff --git a/base/cluster-resource-agents/debian/meta_data.yaml b/base/cluster-resource-agents/debian/bullseye/meta_data.yaml
similarity index 100%
rename from base/cluster-resource-agents/debian/meta_data.yaml
rename to base/cluster-resource-agents/debian/bullseye/meta_data.yaml
diff --git a/base/cluster-resource-agents/debian/patches/0006-Patch-postgresql-environment-for-Debian.patch b/base/cluster-resource-agents/debian/bullseye/patches/0006-Patch-postgresql-environment-for-Debian.patch
similarity index 100%
rename from base/cluster-resource-agents/debian/patches/0006-Patch-postgresql-environment-for-Debian.patch
rename to base/cluster-resource-agents/debian/bullseye/patches/0006-Patch-postgresql-environment-for-Debian.patch
diff --git a/base/cluster-resource-agents/debian/patches/Fix-VG-activity-bug-in-heartbeat-LVM-script.patch b/base/cluster-resource-agents/debian/bullseye/patches/Fix-VG-activity-bug-in-heartbeat-LVM-script.patch
similarity index 100%
rename from base/cluster-resource-agents/debian/patches/Fix-VG-activity-bug-in-heartbeat-LVM-script.patch
rename to base/cluster-resource-agents/debian/bullseye/patches/Fix-VG-activity-bug-in-heartbeat-LVM-script.patch
diff --git a/base/cluster-resource-agents/debian/patches/copyright.patch b/base/cluster-resource-agents/debian/bullseye/patches/copyright.patch
similarity index 100%
rename from base/cluster-resource-agents/debian/patches/copyright.patch
rename to base/cluster-resource-agents/debian/bullseye/patches/copyright.patch
diff --git a/base/cluster-resource-agents/debian/patches/ipaddr2-add-logs-to-debug-RTNETLINK-errors.patch b/base/cluster-resource-agents/debian/bullseye/patches/ipaddr2-add-logs-to-debug-RTNETLINK-errors.patch
similarity index 100%
rename from base/cluster-resource-agents/debian/patches/ipaddr2-add-logs-to-debug-RTNETLINK-errors.patch
rename to base/cluster-resource-agents/debian/bullseye/patches/ipaddr2-add-logs-to-debug-RTNETLINK-errors.patch
diff --git a/base/cluster-resource-agents/debian/patches/ipaddr2-avoid-failing-svc-if-down.patch b/base/cluster-resource-agents/debian/bullseye/patches/ipaddr2-avoid-failing-svc-if-down.patch
similarity index 100%
rename from base/cluster-resource-agents/debian/patches/ipaddr2-avoid-failing-svc-if-down.patch
rename to base/cluster-resource-agents/debian/bullseye/patches/ipaddr2-avoid-failing-svc-if-down.patch
diff --git a/base/cluster-resource-agents/debian/patches/ipaddr2-use-host-scope-for-addresses-on-loopback.patch b/base/cluster-resource-agents/debian/bullseye/patches/ipaddr2-use-host-scope-for-addresses-on-loopback.patch
similarity index 100%
rename from base/cluster-resource-agents/debian/patches/ipaddr2-use-host-scope-for-addresses-on-loopback.patch
rename to base/cluster-resource-agents/debian/bullseye/patches/ipaddr2-use-host-scope-for-addresses-on-loopback.patch
diff --git a/base/cluster-resource-agents/debian/patches/ipaddr2_check_if_state.patch b/base/cluster-resource-agents/debian/bullseye/patches/ipaddr2_check_if_state.patch
similarity index 100%
rename from base/cluster-resource-agents/debian/patches/ipaddr2_check_if_state.patch
rename to base/cluster-resource-agents/debian/bullseye/patches/ipaddr2_check_if_state.patch
diff --git a/base/cluster-resource-agents/debian/patches/ipaddr2_if_down.patch b/base/cluster-resource-agents/debian/bullseye/patches/ipaddr2_if_down.patch
similarity index 100%
rename from base/cluster-resource-agents/debian/patches/ipaddr2_if_down.patch
rename to base/cluster-resource-agents/debian/bullseye/patches/ipaddr2_if_down.patch
diff --git a/base/cluster-resource-agents/debian/patches/ipaddr2_ignore_lo_if_state.patch b/base/cluster-resource-agents/debian/bullseye/patches/ipaddr2_ignore_lo_if_state.patch
similarity index 100%
rename from base/cluster-resource-agents/debian/patches/ipaddr2_ignore_lo_if_state.patch
rename to base/cluster-resource-agents/debian/bullseye/patches/ipaddr2_ignore_lo_if_state.patch
diff --git a/base/cluster-resource-agents/debian/patches/lvm_cleanup_refs_on_stop.patch b/base/cluster-resource-agents/debian/bullseye/patches/lvm_cleanup_refs_on_stop.patch
similarity index 100%
rename from base/cluster-resource-agents/debian/patches/lvm_cleanup_refs_on_stop.patch
rename to base/cluster-resource-agents/debian/bullseye/patches/lvm_cleanup_refs_on_stop.patch
diff --git a/base/cluster-resource-agents/debian/patches/lvm_vg_activation.patch b/base/cluster-resource-agents/debian/bullseye/patches/lvm_vg_activation.patch
similarity index 100%
rename from base/cluster-resource-agents/debian/patches/lvm_vg_activation.patch
rename to base/cluster-resource-agents/debian/bullseye/patches/lvm_vg_activation.patch
diff --git a/base/cluster-resource-agents/debian/patches/new_ocf_return_codes.patch b/base/cluster-resource-agents/debian/bullseye/patches/new_ocf_return_codes.patch
similarity index 100%
rename from base/cluster-resource-agents/debian/patches/new_ocf_return_codes.patch
rename to base/cluster-resource-agents/debian/bullseye/patches/new_ocf_return_codes.patch
diff --git a/base/cluster-resource-agents/debian/patches/ocf-shellfuncs_change_logtag.patch b/base/cluster-resource-agents/debian/bullseye/patches/ocf-shellfuncs_change_logtag.patch
similarity index 100%
rename from base/cluster-resource-agents/debian/patches/ocf-shellfuncs_change_logtag.patch
rename to base/cluster-resource-agents/debian/bullseye/patches/ocf-shellfuncs_change_logtag.patch
diff --git a/base/cluster-resource-agents/debian/patches/series b/base/cluster-resource-agents/debian/bullseye/patches/series
similarity index 100%
rename from base/cluster-resource-agents/debian/patches/series
rename to base/cluster-resource-agents/debian/bullseye/patches/series
diff --git a/base/cluster-resource-agents/debian/patches/umount-in-namespace.patch b/base/cluster-resource-agents/debian/bullseye/patches/umount-in-namespace.patch
similarity index 100%
rename from base/cluster-resource-agents/debian/patches/umount-in-namespace.patch
rename to base/cluster-resource-agents/debian/bullseye/patches/umount-in-namespace.patch
diff --git a/base/dhcp/debian/deb_patches/0001-dhclient-dhcp6-set-hostname.patch b/base/dhcp/debian/bullseye/deb_patches/0001-dhclient-dhcp6-set-hostname.patch
similarity index 100%
rename from base/dhcp/debian/deb_patches/0001-dhclient-dhcp6-set-hostname.patch
rename to base/dhcp/debian/bullseye/deb_patches/0001-dhclient-dhcp6-set-hostname.patch
diff --git a/base/dhcp/debian/deb_patches/0002-Update-dn-and-dns-only-with-diff-upon-RENEW.patch b/base/dhcp/debian/bullseye/deb_patches/0002-Update-dn-and-dns-only-with-diff-upon-RENEW.patch
similarity index 100%
rename from base/dhcp/debian/deb_patches/0002-Update-dn-and-dns-only-with-diff-upon-RENEW.patch
rename to base/dhcp/debian/bullseye/deb_patches/0002-Update-dn-and-dns-only-with-diff-upon-RENEW.patch
diff --git a/base/dhcp/debian/deb_patches/0003-Use-prefixlen-for-IPv6-address-operations.patch b/base/dhcp/debian/bullseye/deb_patches/0003-Use-prefixlen-for-IPv6-address-operations.patch
similarity index 100%
rename from base/dhcp/debian/deb_patches/0003-Use-prefixlen-for-IPv6-address-operations.patch
rename to base/dhcp/debian/bullseye/deb_patches/0003-Use-prefixlen-for-IPv6-address-operations.patch
diff --git a/base/dhcp/debian/deb_patches/0004-use-DHCPv6-FQDN-hostname-field-to-set-hostname.patch b/base/dhcp/debian/bullseye/deb_patches/0004-use-DHCPv6-FQDN-hostname-field-to-set-hostname.patch
similarity index 100%
rename from base/dhcp/debian/deb_patches/0004-use-DHCPv6-FQDN-hostname-field-to-set-hostname.patch
rename to base/dhcp/debian/bullseye/deb_patches/0004-use-DHCPv6-FQDN-hostname-field-to-set-hostname.patch
diff --git a/base/dhcp/debian/deb_patches/series b/base/dhcp/debian/bullseye/deb_patches/series
similarity index 100%
rename from base/dhcp/debian/deb_patches/series
rename to base/dhcp/debian/bullseye/deb_patches/series
diff --git a/base/dhcp/debian/meta_data.yaml b/base/dhcp/debian/bullseye/meta_data.yaml
similarity index 100%
rename from base/dhcp/debian/meta_data.yaml
rename to base/dhcp/debian/bullseye/meta_data.yaml
diff --git a/base/dhcp/debian/patches/CVE-2022-2928.patch b/base/dhcp/debian/bullseye/patches/CVE-2022-2928.patch
similarity index 100%
rename from base/dhcp/debian/patches/CVE-2022-2928.patch
rename to base/dhcp/debian/bullseye/patches/CVE-2022-2928.patch
diff --git a/base/dhcp/debian/patches/CVE-2022-2929.patch b/base/dhcp/debian/bullseye/patches/CVE-2022-2929.patch
similarity index 100%
rename from base/dhcp/debian/patches/CVE-2022-2929.patch
rename to base/dhcp/debian/bullseye/patches/CVE-2022-2929.patch
diff --git a/base/dhcp/debian/patches/dhclient-ipv6-bind-to-interface.patch b/base/dhcp/debian/bullseye/patches/dhclient-ipv6-bind-to-interface.patch
similarity index 100%
rename from base/dhcp/debian/patches/dhclient-ipv6-bind-to-interface.patch
rename to base/dhcp/debian/bullseye/patches/dhclient-ipv6-bind-to-interface.patch
diff --git a/base/dhcp/debian/patches/dhclient-ipv6-conditionally-set-hostname.patch b/base/dhcp/debian/bullseye/patches/dhclient-ipv6-conditionally-set-hostname.patch
similarity index 100%
rename from base/dhcp/debian/patches/dhclient-ipv6-conditionally-set-hostname.patch
rename to base/dhcp/debian/bullseye/patches/dhclient-ipv6-conditionally-set-hostname.patch
diff --git a/base/dhcp/debian/patches/dhclient-restrict-interfaces-to-command-line.patch b/base/dhcp/debian/bullseye/patches/dhclient-restrict-interfaces-to-command-line.patch
similarity index 100%
rename from base/dhcp/debian/patches/dhclient-restrict-interfaces-to-command-line.patch
rename to base/dhcp/debian/bullseye/patches/dhclient-restrict-interfaces-to-command-line.patch
diff --git a/base/dhcp/debian/patches/dhclient-set-the-default-prefix-length-to-64.patch b/base/dhcp/debian/bullseye/patches/dhclient-set-the-default-prefix-length-to-64.patch
similarity index 100%
rename from base/dhcp/debian/patches/dhclient-set-the-default-prefix-length-to-64.patch
rename to base/dhcp/debian/bullseye/patches/dhclient-set-the-default-prefix-length-to-64.patch
diff --git a/base/dhcp/debian/patches/series b/base/dhcp/debian/bullseye/patches/series
similarity index 100%
rename from base/dhcp/debian/patches/series
rename to base/dhcp/debian/bullseye/patches/series
diff --git a/base/dnsmasq/debian/deb_patches/0001-Disable-systemd-for-dnsmasq.patch b/base/dnsmasq/debian/bullseye/deb_patches/0001-Disable-systemd-for-dnsmasq.patch
similarity index 100%
rename from base/dnsmasq/debian/deb_patches/0001-Disable-systemd-for-dnsmasq.patch
rename to base/dnsmasq/debian/bullseye/deb_patches/0001-Disable-systemd-for-dnsmasq.patch
diff --git a/base/dnsmasq/debian/deb_patches/series b/base/dnsmasq/debian/bullseye/deb_patches/series
similarity index 100%
rename from base/dnsmasq/debian/deb_patches/series
rename to base/dnsmasq/debian/bullseye/deb_patches/series
diff --git a/base/dnsmasq/debian/meta_data.yaml b/base/dnsmasq/debian/bullseye/meta_data.yaml
similarity index 100%
rename from base/dnsmasq/debian/meta_data.yaml
rename to base/dnsmasq/debian/bullseye/meta_data.yaml
diff --git a/base/dnsmasq/debian/patches/close-tftp-sockets-immediately.patch b/base/dnsmasq/debian/bullseye/patches/close-tftp-sockets-immediately.patch
similarity index 100%
rename from base/dnsmasq/debian/patches/close-tftp-sockets-immediately.patch
rename to base/dnsmasq/debian/bullseye/patches/close-tftp-sockets-immediately.patch
diff --git a/base/dnsmasq/debian/patches/dnsmasq-update-ipv6-leases-from-config.patch b/base/dnsmasq/debian/bullseye/patches/dnsmasq-update-ipv6-leases-from-config.patch
similarity index 100%
rename from base/dnsmasq/debian/patches/dnsmasq-update-ipv6-leases-from-config.patch
rename to base/dnsmasq/debian/bullseye/patches/dnsmasq-update-ipv6-leases-from-config.patch
diff --git a/base/dnsmasq/debian/patches/series b/base/dnsmasq/debian/bullseye/patches/series
similarity index 100%
rename from base/dnsmasq/debian/patches/series
rename to base/dnsmasq/debian/bullseye/patches/series
diff --git a/base/haproxy/debian/deb_patches/0001-Remove-init-files-from-haproxy-package.patch b/base/haproxy/debian/bullseye/deb_patches/0001-Remove-init-files-from-haproxy-package.patch
similarity index 100%
rename from base/haproxy/debian/deb_patches/0001-Remove-init-files-from-haproxy-package.patch
rename to base/haproxy/debian/bullseye/deb_patches/0001-Remove-init-files-from-haproxy-package.patch
diff --git a/base/haproxy/debian/deb_patches/series b/base/haproxy/debian/bullseye/deb_patches/series
similarity index 100%
rename from base/haproxy/debian/deb_patches/series
rename to base/haproxy/debian/bullseye/deb_patches/series
diff --git a/base/haproxy/debian/meta_data.yaml b/base/haproxy/debian/bullseye/meta_data.yaml
similarity index 100%
rename from base/haproxy/debian/meta_data.yaml
rename to base/haproxy/debian/bullseye/meta_data.yaml
diff --git a/base/libfdt/debian/deb_folder/changelog b/base/libfdt/debian/bullseye/deb_folder/changelog
similarity index 100%
rename from base/libfdt/debian/deb_folder/changelog
rename to base/libfdt/debian/bullseye/deb_folder/changelog
diff --git a/base/libfdt/debian/deb_folder/control b/base/libfdt/debian/bullseye/deb_folder/control
similarity index 100%
rename from base/libfdt/debian/deb_folder/control
rename to base/libfdt/debian/bullseye/deb_folder/control
diff --git a/base/libfdt/debian/deb_folder/copyright b/base/libfdt/debian/bullseye/deb_folder/copyright
similarity index 100%
rename from base/libfdt/debian/deb_folder/copyright
rename to base/libfdt/debian/bullseye/deb_folder/copyright
diff --git a/base/libfdt/debian/deb_folder/libfdt.install b/base/libfdt/debian/bullseye/deb_folder/libfdt.install
similarity index 100%
rename from base/libfdt/debian/deb_folder/libfdt.install
rename to base/libfdt/debian/bullseye/deb_folder/libfdt.install
diff --git a/base/libfdt/debian/deb_folder/patches/0001-Remove-redundant-YYLOC-global-declaration.patch b/base/libfdt/debian/bullseye/deb_folder/patches/0001-Remove-redundant-YYLOC-global-declaration.patch
similarity index 100%
rename from base/libfdt/debian/deb_folder/patches/0001-Remove-redundant-YYLOC-global-declaration.patch
rename to base/libfdt/debian/bullseye/deb_folder/patches/0001-Remove-redundant-YYLOC-global-declaration.patch
diff --git a/base/libfdt/debian/deb_folder/patches/series b/base/libfdt/debian/bullseye/deb_folder/patches/series
similarity index 100%
rename from base/libfdt/debian/deb_folder/patches/series
rename to base/libfdt/debian/bullseye/deb_folder/patches/series
diff --git a/base/libfdt/debian/deb_folder/rules b/base/libfdt/debian/bullseye/deb_folder/rules
similarity index 100%
rename from base/libfdt/debian/deb_folder/rules
rename to base/libfdt/debian/bullseye/deb_folder/rules
diff --git a/base/libfdt/debian/deb_folder/source/format b/base/libfdt/debian/bullseye/deb_folder/source/format
similarity index 100%
rename from base/libfdt/debian/deb_folder/source/format
rename to base/libfdt/debian/bullseye/deb_folder/source/format
diff --git a/base/libfdt/debian/deb_folder/source/local-options b/base/libfdt/debian/bullseye/deb_folder/source/local-options
similarity index 100%
rename from base/libfdt/debian/deb_folder/source/local-options
rename to base/libfdt/debian/bullseye/deb_folder/source/local-options
diff --git a/base/libfdt/debian/meta_data.yaml b/base/libfdt/debian/bullseye/meta_data.yaml
similarity index 100%
rename from base/libfdt/debian/meta_data.yaml
rename to base/libfdt/debian/bullseye/meta_data.yaml
diff --git a/base/lighttpd/debian/deb_patches/0001-lighttpd-backport-spec-include-TiS-changes.patch-fro.patch b/base/lighttpd/debian/bullseye/deb_patches/0001-lighttpd-backport-spec-include-TiS-changes.patch-fro.patch
similarity index 100%
rename from base/lighttpd/debian/deb_patches/0001-lighttpd-backport-spec-include-TiS-changes.patch-fro.patch
rename to base/lighttpd/debian/bullseye/deb_patches/0001-lighttpd-backport-spec-include-TiS-changes.patch-fro.patch
diff --git a/base/lighttpd/debian/deb_patches/series b/base/lighttpd/debian/bullseye/deb_patches/series
similarity index 100%
rename from base/lighttpd/debian/deb_patches/series
rename to base/lighttpd/debian/bullseye/deb_patches/series
diff --git a/base/lighttpd/debian/meta_data.yaml b/base/lighttpd/debian/bullseye/meta_data.yaml
similarity index 100%
rename from base/lighttpd/debian/meta_data.yaml
rename to base/lighttpd/debian/bullseye/meta_data.yaml
diff --git a/base/lighttpd/debian/patches/CVE-2022-22707.patch b/base/lighttpd/debian/bullseye/patches/CVE-2022-22707.patch
similarity index 100%
rename from base/lighttpd/debian/patches/CVE-2022-22707.patch
rename to base/lighttpd/debian/bullseye/patches/CVE-2022-22707.patch
diff --git a/base/lighttpd/debian/patches/CVE-2022-37797.patch b/base/lighttpd/debian/bullseye/patches/CVE-2022-37797.patch
similarity index 100%
rename from base/lighttpd/debian/patches/CVE-2022-37797.patch
rename to base/lighttpd/debian/bullseye/patches/CVE-2022-37797.patch
diff --git a/base/lighttpd/debian/patches/check-content-length.patch b/base/lighttpd/debian/bullseye/patches/check-content-length.patch
similarity index 100%
rename from base/lighttpd/debian/patches/check-content-length.patch
rename to base/lighttpd/debian/bullseye/patches/check-content-length.patch
diff --git a/base/lighttpd/debian/patches/series b/base/lighttpd/debian/bullseye/patches/series
similarity index 100%
rename from base/lighttpd/debian/patches/series
rename to base/lighttpd/debian/bullseye/patches/series
diff --git a/base/linuxptp/debian/meta_data.yaml b/base/linuxptp/debian/bullseye/meta_data.yaml
similarity index 100%
rename from base/linuxptp/debian/meta_data.yaml
rename to base/linuxptp/debian/bullseye/meta_data.yaml
diff --git a/base/linuxptp/debian/patches/0001-clock-Reset-state-when-switching-port-with-same-best.patch b/base/linuxptp/debian/bullseye/patches/0001-clock-Reset-state-when-switching-port-with-same-best.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0001-clock-Reset-state-when-switching-port-with-same-best.patch
rename to base/linuxptp/debian/bullseye/patches/0001-clock-Reset-state-when-switching-port-with-same-best.patch
diff --git a/base/linuxptp/debian/patches/0002-clock-Reset-clock-check-on-best-clock-port-change.patch b/base/linuxptp/debian/bullseye/patches/0002-clock-Reset-clock-check-on-best-clock-port-change.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0002-clock-Reset-clock-check-on-best-clock-port-change.patch
rename to base/linuxptp/debian/bullseye/patches/0002-clock-Reset-clock-check-on-best-clock-port-change.patch
diff --git a/base/linuxptp/debian/patches/0003-port-Don-t-check-timestamps-from-non-slave-ports.patch b/base/linuxptp/debian/bullseye/patches/0003-port-Don-t-check-timestamps-from-non-slave-ports.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0003-port-Don-t-check-timestamps-from-non-slave-ports.patch
rename to base/linuxptp/debian/bullseye/patches/0003-port-Don-t-check-timestamps-from-non-slave-ports.patch
diff --git a/base/linuxptp/debian/patches/0004-port-Don-t-renew-raw-transport.patch b/base/linuxptp/debian/bullseye/patches/0004-port-Don-t-renew-raw-transport.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0004-port-Don-t-renew-raw-transport.patch
rename to base/linuxptp/debian/bullseye/patches/0004-port-Don-t-renew-raw-transport.patch
diff --git a/base/linuxptp/debian/patches/0005-clockcheck-Increase-minimum-interval.patch b/base/linuxptp/debian/bullseye/patches/0005-clockcheck-Increase-minimum-interval.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0005-clockcheck-Increase-minimum-interval.patch
rename to base/linuxptp/debian/bullseye/patches/0005-clockcheck-Increase-minimum-interval.patch
diff --git a/base/linuxptp/debian/patches/0006-Add-option-to-disable-default-port-selection-in-phc2.patch b/base/linuxptp/debian/bullseye/patches/0006-Add-option-to-disable-default-port-selection-in-phc2.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0006-Add-option-to-disable-default-port-selection-in-phc2.patch
rename to base/linuxptp/debian/bullseye/patches/0006-Add-option-to-disable-default-port-selection-in-phc2.patch
diff --git a/base/linuxptp/debian/patches/0007-sysoff-Change-sysoff_measure-to-return-errno.patch b/base/linuxptp/debian/bullseye/patches/0007-sysoff-Change-sysoff_measure-to-return-errno.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0007-sysoff-Change-sysoff_measure-to-return-errno.patch
rename to base/linuxptp/debian/bullseye/patches/0007-sysoff-Change-sysoff_measure-to-return-errno.patch
diff --git a/base/linuxptp/debian/patches/0008-sysoff-Change-log-level-of-ioctl-error-messages.patch b/base/linuxptp/debian/bullseye/patches/0008-sysoff-Change-log-level-of-ioctl-error-messages.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0008-sysoff-Change-log-level-of-ioctl-error-messages.patch
rename to base/linuxptp/debian/bullseye/patches/0008-sysoff-Change-log-level-of-ioctl-error-messages.patch
diff --git a/base/linuxptp/debian/patches/0009-sysoff-Retry-on-EBUSY-when-probing-supported-ioctls.patch b/base/linuxptp/debian/bullseye/patches/0009-sysoff-Retry-on-EBUSY-when-probing-supported-ioctls.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0009-sysoff-Retry-on-EBUSY-when-probing-supported-ioctls.patch
rename to base/linuxptp/debian/bullseye/patches/0009-sysoff-Retry-on-EBUSY-when-probing-supported-ioctls.patch
diff --git a/base/linuxptp/debian/patches/0010-phc2sys-Don-t-exit-when-reading-of-PHC-fails-with-EB.patch b/base/linuxptp/debian/bullseye/patches/0010-phc2sys-Don-t-exit-when-reading-of-PHC-fails-with-EB.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0010-phc2sys-Don-t-exit-when-reading-of-PHC-fails-with-EB.patch
rename to base/linuxptp/debian/bullseye/patches/0010-phc2sys-Don-t-exit-when-reading-of-PHC-fails-with-EB.patch
diff --git a/base/linuxptp/debian/patches/0011-phc2sys-extract-PMC-functionality-into-a-smaller-str.patch b/base/linuxptp/debian/bullseye/patches/0011-phc2sys-extract-PMC-functionality-into-a-smaller-str.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0011-phc2sys-extract-PMC-functionality-into-a-smaller-str.patch
rename to base/linuxptp/debian/bullseye/patches/0011-phc2sys-extract-PMC-functionality-into-a-smaller-str.patch
diff --git a/base/linuxptp/debian/patches/0012-phc2sys-make-PMC-functions-non-static.patch b/base/linuxptp/debian/bullseye/patches/0012-phc2sys-make-PMC-functions-non-static.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0012-phc2sys-make-PMC-functions-non-static.patch
rename to base/linuxptp/debian/bullseye/patches/0012-phc2sys-make-PMC-functions-non-static.patch
diff --git a/base/linuxptp/debian/patches/0013-phc2sys-break-out-pmc-code-into-pmc_common.c.patch b/base/linuxptp/debian/bullseye/patches/0013-phc2sys-break-out-pmc-code-into-pmc_common.c.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0013-phc2sys-break-out-pmc-code-into-pmc_common.c.patch
rename to base/linuxptp/debian/bullseye/patches/0013-phc2sys-break-out-pmc-code-into-pmc_common.c.patch
diff --git a/base/linuxptp/debian/patches/0014-Introduce-the-PMC-agent-module.patch b/base/linuxptp/debian/bullseye/patches/0014-Introduce-the-PMC-agent-module.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0014-Introduce-the-PMC-agent-module.patch
rename to base/linuxptp/debian/bullseye/patches/0014-Introduce-the-PMC-agent-module.patch
diff --git a/base/linuxptp/debian/patches/0015-pmc_agent-Rename-pmc_node-to-something-more-descript.patch b/base/linuxptp/debian/bullseye/patches/0015-pmc_agent-Rename-pmc_node-to-something-more-descript.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0015-pmc_agent-Rename-pmc_node-to-something-more-descript.patch
rename to base/linuxptp/debian/bullseye/patches/0015-pmc_agent-Rename-pmc_node-to-something-more-descript.patch
diff --git a/base/linuxptp/debian/patches/0016-pmc_agent-Hide-the-implementation.patch b/base/linuxptp/debian/bullseye/patches/0016-pmc_agent-Hide-the-implementation.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0016-pmc_agent-Hide-the-implementation.patch
rename to base/linuxptp/debian/bullseye/patches/0016-pmc_agent-Hide-the-implementation.patch
diff --git a/base/linuxptp/debian/patches/0017-Find-a-better-home-for-the-management-TLV-ID-helper-.patch b/base/linuxptp/debian/bullseye/patches/0017-Find-a-better-home-for-the-management-TLV-ID-helper-.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0017-Find-a-better-home-for-the-management-TLV-ID-helper-.patch
rename to base/linuxptp/debian/bullseye/patches/0017-Find-a-better-home-for-the-management-TLV-ID-helper-.patch
diff --git a/base/linuxptp/debian/patches/0018-Find-a-better-home-for-the-management-TLV-data-helpe.patch b/base/linuxptp/debian/bullseye/patches/0018-Find-a-better-home-for-the-management-TLV-data-helpe.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0018-Find-a-better-home-for-the-management-TLV-data-helpe.patch
rename to base/linuxptp/debian/bullseye/patches/0018-Find-a-better-home-for-the-management-TLV-data-helpe.patch
diff --git a/base/linuxptp/debian/patches/0019-Introduce-error-codes-for-the-run_pmc-method.patch b/base/linuxptp/debian/bullseye/patches/0019-Introduce-error-codes-for-the-run_pmc-method.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0019-Introduce-error-codes-for-the-run_pmc-method.patch
rename to base/linuxptp/debian/bullseye/patches/0019-Introduce-error-codes-for-the-run_pmc-method.patch
diff --git a/base/linuxptp/debian/patches/0020-pmc_agent-Convert-the-subscribe-method-into-the-cano.patch b/base/linuxptp/debian/bullseye/patches/0020-pmc_agent-Convert-the-subscribe-method-into-the-cano.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0020-pmc_agent-Convert-the-subscribe-method-into-the-cano.patch
rename to base/linuxptp/debian/bullseye/patches/0020-pmc_agent-Convert-the-subscribe-method-into-the-cano.patch
diff --git a/base/linuxptp/debian/patches/0021-pmc_agent-Simplify-the-update-method.patch b/base/linuxptp/debian/bullseye/patches/0021-pmc_agent-Simplify-the-update-method.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0021-pmc_agent-Simplify-the-update-method.patch
rename to base/linuxptp/debian/bullseye/patches/0021-pmc_agent-Simplify-the-update-method.patch
diff --git a/base/linuxptp/debian/patches/0022-pmc_agent-Simplify-logic-in-update-method.patch b/base/linuxptp/debian/bullseye/patches/0022-pmc_agent-Simplify-logic-in-update-method.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0022-pmc_agent-Simplify-logic-in-update-method.patch
rename to base/linuxptp/debian/bullseye/patches/0022-pmc_agent-Simplify-logic-in-update-method.patch
diff --git a/base/linuxptp/debian/patches/0023-pmc_agent-Remove-bogus-comparison-between-last-updat.patch b/base/linuxptp/debian/bullseye/patches/0023-pmc_agent-Remove-bogus-comparison-between-last-updat.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0023-pmc_agent-Remove-bogus-comparison-between-last-updat.patch
rename to base/linuxptp/debian/bullseye/patches/0023-pmc_agent-Remove-bogus-comparison-between-last-updat.patch
diff --git a/base/linuxptp/debian/patches/0024-pmc_agent-Perform-time-comparison-using-positive-log.patch b/base/linuxptp/debian/bullseye/patches/0024-pmc_agent-Perform-time-comparison-using-positive-log.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0024-pmc_agent-Perform-time-comparison-using-positive-log.patch
rename to base/linuxptp/debian/bullseye/patches/0024-pmc_agent-Perform-time-comparison-using-positive-log.patch
diff --git a/base/linuxptp/debian/patches/0025-pmc_agent-Rename-the-update-method-and-attempt-to-do.patch b/base/linuxptp/debian/bullseye/patches/0025-pmc_agent-Rename-the-update-method-and-attempt-to-do.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0025-pmc_agent-Rename-the-update-method-and-attempt-to-do.patch
rename to base/linuxptp/debian/bullseye/patches/0025-pmc_agent-Rename-the-update-method-and-attempt-to-do.patch
diff --git a/base/linuxptp/debian/patches/0026-phc2sys-Fix-null-pointer-de-reference-in-manual-mode.patch b/base/linuxptp/debian/bullseye/patches/0026-phc2sys-Fix-null-pointer-de-reference-in-manual-mode.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0026-phc2sys-Fix-null-pointer-de-reference-in-manual-mode.patch
rename to base/linuxptp/debian/bullseye/patches/0026-phc2sys-Fix-null-pointer-de-reference-in-manual-mode.patch
diff --git a/base/linuxptp/debian/patches/0027-pmc_agent-Convert-the-method-that-queries-TAI-UTC-of.patch b/base/linuxptp/debian/bullseye/patches/0027-pmc_agent-Convert-the-method-that-queries-TAI-UTC-of.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0027-pmc_agent-Convert-the-method-that-queries-TAI-UTC-of.patch
rename to base/linuxptp/debian/bullseye/patches/0027-pmc_agent-Convert-the-method-that-queries-TAI-UTC-of.patch
diff --git a/base/linuxptp/debian/patches/0028-pmc_agent-Convert-the-method-that-queries-the-port-p.patch b/base/linuxptp/debian/bullseye/patches/0028-pmc_agent-Convert-the-method-that-queries-the-port-p.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0028-pmc_agent-Convert-the-method-that-queries-the-port-p.patch
rename to base/linuxptp/debian/bullseye/patches/0028-pmc_agent-Convert-the-method-that-queries-the-port-p.patch
diff --git a/base/linuxptp/debian/patches/0029-pmc_agent-Generalize-the-method-that-queries-the-loc.patch b/base/linuxptp/debian/bullseye/patches/0029-pmc_agent-Generalize-the-method-that-queries-the-loc.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0029-pmc_agent-Generalize-the-method-that-queries-the-loc.patch
rename to base/linuxptp/debian/bullseye/patches/0029-pmc_agent-Generalize-the-method-that-queries-the-loc.patch
diff --git a/base/linuxptp/debian/patches/0030-pmc_agent-Simplify-the-method-that-gets-of-the-numbe.patch b/base/linuxptp/debian/bullseye/patches/0030-pmc_agent-Simplify-the-method-that-gets-of-the-numbe.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0030-pmc_agent-Simplify-the-method-that-gets-of-the-numbe.patch
rename to base/linuxptp/debian/bullseye/patches/0030-pmc_agent-Simplify-the-method-that-gets-of-the-numbe.patch
diff --git a/base/linuxptp/debian/patches/0031-pmc_agent-Let-the-update-method-poll-for-push-events.patch b/base/linuxptp/debian/bullseye/patches/0031-pmc_agent-Let-the-update-method-poll-for-push-events.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0031-pmc_agent-Let-the-update-method-poll-for-push-events.patch
rename to base/linuxptp/debian/bullseye/patches/0031-pmc_agent-Let-the-update-method-poll-for-push-events.patch
diff --git a/base/linuxptp/debian/patches/0032-phc2sys-Fix-regression-in-the-automatic-mode.patch b/base/linuxptp/debian/bullseye/patches/0032-phc2sys-Fix-regression-in-the-automatic-mode.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0032-phc2sys-Fix-regression-in-the-automatic-mode.patch
rename to base/linuxptp/debian/bullseye/patches/0032-phc2sys-Fix-regression-in-the-automatic-mode.patch
diff --git a/base/linuxptp/debian/patches/0033-Implement-push-notification-for-TIME_STATUS_NP.patch b/base/linuxptp/debian/bullseye/patches/0033-Implement-push-notification-for-TIME_STATUS_NP.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0033-Implement-push-notification-for-TIME_STATUS_NP.patch
rename to base/linuxptp/debian/bullseye/patches/0033-Implement-push-notification-for-TIME_STATUS_NP.patch
diff --git a/base/linuxptp/debian/patches/0034-clock-Rename-UDS-variables-to-read-write.patch b/base/linuxptp/debian/bullseye/patches/0034-clock-Rename-UDS-variables-to-read-write.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0034-clock-Rename-UDS-variables-to-read-write.patch
rename to base/linuxptp/debian/bullseye/patches/0034-clock-Rename-UDS-variables-to-read-write.patch
diff --git a/base/linuxptp/debian/patches/0035-clock-Add-read-only-UDS-port-for-monitoring.patch b/base/linuxptp/debian/bullseye/patches/0035-clock-Add-read-only-UDS-port-for-monitoring.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0035-clock-Add-read-only-UDS-port-for-monitoring.patch
rename to base/linuxptp/debian/bullseye/patches/0035-clock-Add-read-only-UDS-port-for-monitoring.patch
diff --git a/base/linuxptp/debian/patches/0036-Rename-management-ID-macros.patch b/base/linuxptp/debian/bullseye/patches/0036-Rename-management-ID-macros.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0036-Rename-management-ID-macros.patch
rename to base/linuxptp/debian/bullseye/patches/0036-Rename-management-ID-macros.patch
diff --git a/base/linuxptp/debian/patches/0037-Enhance-phc2sys-to-accept-multiple-ptp4l-inputs.patch b/base/linuxptp/debian/bullseye/patches/0037-Enhance-phc2sys-to-accept-multiple-ptp4l-inputs.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0037-Enhance-phc2sys-to-accept-multiple-ptp4l-inputs.patch
rename to base/linuxptp/debian/bullseye/patches/0037-Enhance-phc2sys-to-accept-multiple-ptp4l-inputs.patch
diff --git a/base/linuxptp/debian/patches/0038-Best-source-selection-algorithm.patch b/base/linuxptp/debian/bullseye/patches/0038-Best-source-selection-algorithm.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0038-Best-source-selection-algorithm.patch
rename to base/linuxptp/debian/bullseye/patches/0038-Best-source-selection-algorithm.patch
diff --git a/base/linuxptp/debian/patches/0039-Select-best-source-clock-after-state-changes.patch b/base/linuxptp/debian/bullseye/patches/0039-Select-best-source-clock-after-state-changes.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0039-Select-best-source-clock-after-state-changes.patch
rename to base/linuxptp/debian/bullseye/patches/0039-Select-best-source-clock-after-state-changes.patch
diff --git a/base/linuxptp/debian/patches/0040-Forced-lock-a-clock-source-in-configuration.patch b/base/linuxptp/debian/bullseye/patches/0040-Forced-lock-a-clock-source-in-configuration.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0040-Forced-lock-a-clock-source-in-configuration.patch
rename to base/linuxptp/debian/bullseye/patches/0040-Forced-lock-a-clock-source-in-configuration.patch
diff --git a/base/linuxptp/debian/patches/0041-HA-phc2sys-com-socket.patch b/base/linuxptp/debian/bullseye/patches/0041-HA-phc2sys-com-socket.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0041-HA-phc2sys-com-socket.patch
rename to base/linuxptp/debian/bullseye/patches/0041-HA-phc2sys-com-socket.patch
diff --git a/base/linuxptp/debian/patches/0042-Commands-enable-lock-and-disable-lock.patch b/base/linuxptp/debian/bullseye/patches/0042-Commands-enable-lock-and-disable-lock.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0042-Commands-enable-lock-and-disable-lock.patch
rename to base/linuxptp/debian/bullseye/patches/0042-Commands-enable-lock-and-disable-lock.patch
diff --git a/base/linuxptp/debian/patches/0043-Commands-enable-source-and-disable-source.patch b/base/linuxptp/debian/bullseye/patches/0043-Commands-enable-source-and-disable-source.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0043-Commands-enable-source-and-disable-source.patch
rename to base/linuxptp/debian/bullseye/patches/0043-Commands-enable-source-and-disable-source.patch
diff --git a/base/linuxptp/debian/patches/0044-Stream-type-phc2sys-com-socket.patch b/base/linuxptp/debian/bullseye/patches/0044-Stream-type-phc2sys-com-socket.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0044-Stream-type-phc2sys-com-socket.patch
rename to base/linuxptp/debian/bullseye/patches/0044-Stream-type-phc2sys-com-socket.patch
diff --git a/base/linuxptp/debian/patches/0045-Functions-starts_with-and-str_at_column.patch b/base/linuxptp/debian/bullseye/patches/0045-Functions-starts_with-and-str_at_column.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0045-Functions-starts_with-and-str_at_column.patch
rename to base/linuxptp/debian/bullseye/patches/0045-Functions-starts_with-and-str_at_column.patch
diff --git a/base/linuxptp/debian/patches/0046-Robustness-improvements-to-phc2sys-socket.patch b/base/linuxptp/debian/bullseye/patches/0046-Robustness-improvements-to-phc2sys-socket.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0046-Robustness-improvements-to-phc2sys-socket.patch
rename to base/linuxptp/debian/bullseye/patches/0046-Robustness-improvements-to-phc2sys-socket.patch
diff --git a/base/linuxptp/debian/patches/0047-phc2sys-without-w-option.patch b/base/linuxptp/debian/bullseye/patches/0047-phc2sys-without-w-option.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0047-phc2sys-without-w-option.patch
rename to base/linuxptp/debian/bullseye/patches/0047-phc2sys-without-w-option.patch
diff --git a/base/linuxptp/debian/patches/0048-HA-domain-number.patch b/base/linuxptp/debian/bullseye/patches/0048-HA-domain-number.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0048-HA-domain-number.patch
rename to base/linuxptp/debian/bullseye/patches/0048-HA-domain-number.patch
diff --git a/base/linuxptp/debian/patches/0049-GM-clock-accuracy-and-offset-scaled-log-variance.patch b/base/linuxptp/debian/bullseye/patches/0049-GM-clock-accuracy-and-offset-scaled-log-variance.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0049-GM-clock-accuracy-and-offset-scaled-log-variance.patch
rename to base/linuxptp/debian/bullseye/patches/0049-GM-clock-accuracy-and-offset-scaled-log-variance.patch
diff --git a/base/linuxptp/debian/patches/0050-Select-matching-requirements-clock-if-active-doesn-t.patch b/base/linuxptp/debian/bullseye/patches/0050-Select-matching-requirements-clock-if-active-doesn-t.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0050-Select-matching-requirements-clock-if-active-doesn-t.patch
rename to base/linuxptp/debian/bullseye/patches/0050-Select-matching-requirements-clock-if-active-doesn-t.patch
diff --git a/base/linuxptp/debian/patches/0051-Time-traceable-flag.patch b/base/linuxptp/debian/bullseye/patches/0051-Time-traceable-flag.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0051-Time-traceable-flag.patch
rename to base/linuxptp/debian/bullseye/patches/0051-Time-traceable-flag.patch
diff --git a/base/linuxptp/debian/patches/0052-Command-valid-sources.patch b/base/linuxptp/debian/bullseye/patches/0052-Command-valid-sources.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0052-Command-valid-sources.patch
rename to base/linuxptp/debian/bullseye/patches/0052-Command-valid-sources.patch
diff --git a/base/linuxptp/debian/patches/0053-GM-time-traceable-check-enabled-by-default.patch b/base/linuxptp/debian/bullseye/patches/0053-GM-time-traceable-check-enabled-by-default.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0053-GM-time-traceable-check-enabled-by-default.patch
rename to base/linuxptp/debian/bullseye/patches/0053-GM-time-traceable-check-enabled-by-default.patch
diff --git a/base/linuxptp/debian/patches/0054-Disable-active-interface-failing.patch b/base/linuxptp/debian/bullseye/patches/0054-Disable-active-interface-failing.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0054-Disable-active-interface-failing.patch
rename to base/linuxptp/debian/bullseye/patches/0054-Disable-active-interface-failing.patch
diff --git a/base/linuxptp/debian/patches/0055-Ignore-interface-in-conf-file-when-HA-is-disabled.patch b/base/linuxptp/debian/bullseye/patches/0055-Ignore-interface-in-conf-file-when-HA-is-disabled.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0055-Ignore-interface-in-conf-file-when-HA-is-disabled.patch
rename to base/linuxptp/debian/bullseye/patches/0055-Ignore-interface-in-conf-file-when-HA-is-disabled.patch
diff --git a/base/linuxptp/debian/patches/0056-Fixed-event-port-id-map.patch b/base/linuxptp/debian/bullseye/patches/0056-Fixed-event-port-id-map.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0056-Fixed-event-port-id-map.patch
rename to base/linuxptp/debian/bullseye/patches/0056-Fixed-event-port-id-map.patch
diff --git a/base/linuxptp/debian/patches/0057-Fix-uninitialized-variable-in-nmea_scan_rmc.patch b/base/linuxptp/debian/bullseye/patches/0057-Fix-uninitialized-variable-in-nmea_scan_rmc.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0057-Fix-uninitialized-variable-in-nmea_scan_rmc.patch
rename to base/linuxptp/debian/bullseye/patches/0057-Fix-uninitialized-variable-in-nmea_scan_rmc.patch
diff --git a/base/linuxptp/debian/patches/0058-ts2phc-skip-updates-after-offset-spike.patch b/base/linuxptp/debian/bullseye/patches/0058-ts2phc-skip-updates-after-offset-spike.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0058-ts2phc-skip-updates-after-offset-spike.patch
rename to base/linuxptp/debian/bullseye/patches/0058-ts2phc-skip-updates-after-offset-spike.patch
diff --git a/base/linuxptp/debian/patches/0059-clock-Downgrade-log-message-about-failed-uds-forward.patch b/base/linuxptp/debian/bullseye/patches/0059-clock-Downgrade-log-message-about-failed-uds-forward.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0059-clock-Downgrade-log-message-about-failed-uds-forward.patch
rename to base/linuxptp/debian/bullseye/patches/0059-clock-Downgrade-log-message-about-failed-uds-forward.patch
diff --git a/base/linuxptp/debian/patches/0060-Fix-HA-clock-selection-of-priority-0-source.patch b/base/linuxptp/debian/bullseye/patches/0060-Fix-HA-clock-selection-of-priority-0-source.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0060-Fix-HA-clock-selection-of-priority-0-source.patch
rename to base/linuxptp/debian/bullseye/patches/0060-Fix-HA-clock-selection-of-priority-0-source.patch
diff --git a/base/linuxptp/debian/patches/0061-Fix-HA-clock-selection-algorithm.patch b/base/linuxptp/debian/bullseye/patches/0061-Fix-HA-clock-selection-algorithm.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0061-Fix-HA-clock-selection-algorithm.patch
rename to base/linuxptp/debian/bullseye/patches/0061-Fix-HA-clock-selection-algorithm.patch
diff --git a/base/linuxptp/debian/patches/0062-Fix-HA-clock-selection-when-poll-timeout.patch b/base/linuxptp/debian/bullseye/patches/0062-Fix-HA-clock-selection-when-poll-timeout.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0062-Fix-HA-clock-selection-when-poll-timeout.patch
rename to base/linuxptp/debian/bullseye/patches/0062-Fix-HA-clock-selection-when-poll-timeout.patch
diff --git a/base/linuxptp/debian/patches/0063-smooth-transparent-ha-switchover-configurable-pmc-update-interval.patch b/base/linuxptp/debian/bullseye/patches/0063-smooth-transparent-ha-switchover-configurable-pmc-update-interval.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0063-smooth-transparent-ha-switchover-configurable-pmc-update-interval.patch
rename to base/linuxptp/debian/bullseye/patches/0063-smooth-transparent-ha-switchover-configurable-pmc-update-interval.patch
diff --git a/base/linuxptp/debian/patches/0064-Fix-HA-PTP4l-instance-down-osclock-swinging.patch b/base/linuxptp/debian/bullseye/patches/0064-Fix-HA-PTP4l-instance-down-osclock-swinging.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0064-Fix-HA-PTP4l-instance-down-osclock-swinging.patch
rename to base/linuxptp/debian/bullseye/patches/0064-Fix-HA-PTP4l-instance-down-osclock-swinging.patch
diff --git a/base/linuxptp/debian/patches/0065-Fix-osclock-swinging-when-pmc-timeout.patch b/base/linuxptp/debian/bullseye/patches/0065-Fix-osclock-swinging-when-pmc-timeout.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0065-Fix-osclock-swinging-when-pmc-timeout.patch
rename to base/linuxptp/debian/bullseye/patches/0065-Fix-osclock-swinging-when-pmc-timeout.patch
diff --git a/base/linuxptp/debian/patches/0066-ts2phc-Add-serial-baudrate-option.patch b/base/linuxptp/debian/bullseye/patches/0066-ts2phc-Add-serial-baudrate-option.patch
similarity index 100%
rename from base/linuxptp/debian/patches/0066-ts2phc-Add-serial-baudrate-option.patch
rename to base/linuxptp/debian/bullseye/patches/0066-ts2phc-Add-serial-baudrate-option.patch
diff --git a/base/linuxptp/debian/patches/series b/base/linuxptp/debian/bullseye/patches/series
similarity index 100%
rename from base/linuxptp/debian/patches/series
rename to base/linuxptp/debian/bullseye/patches/series
diff --git a/base/lsb/debian/meta_data.yaml b/base/lsb/debian/bullseye/meta_data.yaml
similarity index 100%
rename from base/lsb/debian/meta_data.yaml
rename to base/lsb/debian/bullseye/meta_data.yaml
diff --git a/base/lsb/debian/patches/0001-stx-Add-status_of_proc-wrapper-for-centos-compat.patch b/base/lsb/debian/bullseye/patches/0001-stx-Add-status_of_proc-wrapper-for-centos-compat.patch
similarity index 100%
rename from base/lsb/debian/patches/0001-stx-Add-status_of_proc-wrapper-for-centos-compat.patch
rename to base/lsb/debian/bullseye/patches/0001-stx-Add-status_of_proc-wrapper-for-centos-compat.patch
diff --git a/base/lsb/debian/patches/series b/base/lsb/debian/bullseye/patches/series
similarity index 100%
rename from base/lsb/debian/patches/series
rename to base/lsb/debian/bullseye/patches/series
diff --git a/base/lvm2/debian/deb_patches/0001-Change-from-unsupported-gitarchive-format-to-quilt.patch b/base/lvm2/debian/bullseye/deb_patches/0001-Change-from-unsupported-gitarchive-format-to-quilt.patch
similarity index 100%
rename from base/lvm2/debian/deb_patches/0001-Change-from-unsupported-gitarchive-format-to-quilt.patch
rename to base/lvm2/debian/bullseye/deb_patches/0001-Change-from-unsupported-gitarchive-format-to-quilt.patch
diff --git a/base/lvm2/debian/deb_patches/series b/base/lvm2/debian/bullseye/deb_patches/series
similarity index 100%
rename from base/lvm2/debian/deb_patches/series
rename to base/lvm2/debian/bullseye/deb_patches/series
diff --git a/base/lvm2/debian/meta_data.yaml b/base/lvm2/debian/bullseye/meta_data.yaml
similarity index 100%
rename from base/lvm2/debian/meta_data.yaml
rename to base/lvm2/debian/bullseye/meta_data.yaml
diff --git a/base/lvm2/debian/patches/0001-pvscan-support-disabled-event_activation.patch b/base/lvm2/debian/bullseye/patches/0001-pvscan-support-disabled-event_activation.patch
similarity index 100%
rename from base/lvm2/debian/patches/0001-pvscan-support-disabled-event_activation.patch
rename to base/lvm2/debian/bullseye/patches/0001-pvscan-support-disabled-event_activation.patch
diff --git a/base/lvm2/debian/patches/series b/base/lvm2/debian/bullseye/patches/series
similarity index 100%
rename from base/lvm2/debian/patches/series
rename to base/lvm2/debian/bullseye/patches/series
diff --git a/base/openssl/debian/deb_patches/0001-Build-in-support-for-sctp.patch b/base/openssl/debian/bullseye/deb_patches/0001-Build-in-support-for-sctp.patch
similarity index 100%
rename from base/openssl/debian/deb_patches/0001-Build-in-support-for-sctp.patch
rename to base/openssl/debian/bullseye/deb_patches/0001-Build-in-support-for-sctp.patch
diff --git a/base/openssl/debian/deb_patches/series b/base/openssl/debian/bullseye/deb_patches/series
similarity index 100%
rename from base/openssl/debian/deb_patches/series
rename to base/openssl/debian/bullseye/deb_patches/series
diff --git a/base/openssl/debian/meta_data.yaml b/base/openssl/debian/bullseye/meta_data.yaml
similarity index 100%
rename from base/openssl/debian/meta_data.yaml
rename to base/openssl/debian/bullseye/meta_data.yaml
diff --git a/base/pf-bb-config/debian/deb_folder/changelog b/base/pf-bb-config/debian/bullseye/deb_folder/changelog
similarity index 100%
rename from base/pf-bb-config/debian/deb_folder/changelog
rename to base/pf-bb-config/debian/bullseye/deb_folder/changelog
diff --git a/base/pf-bb-config/debian/deb_folder/control b/base/pf-bb-config/debian/bullseye/deb_folder/control
similarity index 100%
rename from base/pf-bb-config/debian/deb_folder/control
rename to base/pf-bb-config/debian/bullseye/deb_folder/control
diff --git a/base/pf-bb-config/debian/deb_folder/copyright b/base/pf-bb-config/debian/bullseye/deb_folder/copyright
similarity index 100%
rename from base/pf-bb-config/debian/deb_folder/copyright
rename to base/pf-bb-config/debian/bullseye/deb_folder/copyright
diff --git a/base/pf-bb-config/debian/deb_folder/patches/Added-acc200_config_1vf_5g.cfg.patch b/base/pf-bb-config/debian/bullseye/deb_folder/patches/Added-acc200_config_1vf_5g.cfg.patch
similarity index 100%
rename from base/pf-bb-config/debian/deb_folder/patches/Added-acc200_config_1vf_5g.cfg.patch
rename to base/pf-bb-config/debian/bullseye/deb_folder/patches/Added-acc200_config_1vf_5g.cfg.patch
diff --git a/base/pf-bb-config/debian/deb_folder/patches/series b/base/pf-bb-config/debian/bullseye/deb_folder/patches/series
similarity index 100%
rename from base/pf-bb-config/debian/deb_folder/patches/series
rename to base/pf-bb-config/debian/bullseye/deb_folder/patches/series
diff --git a/base/pf-bb-config/debian/deb_folder/pf-bb-config.install b/base/pf-bb-config/debian/bullseye/deb_folder/pf-bb-config.install
similarity index 100%
rename from base/pf-bb-config/debian/deb_folder/pf-bb-config.install
rename to base/pf-bb-config/debian/bullseye/deb_folder/pf-bb-config.install
diff --git a/base/pf-bb-config/debian/deb_folder/rules b/base/pf-bb-config/debian/bullseye/deb_folder/rules
similarity index 100%
rename from base/pf-bb-config/debian/deb_folder/rules
rename to base/pf-bb-config/debian/bullseye/deb_folder/rules
diff --git a/base/pf-bb-config/debian/deb_folder/source/format b/base/pf-bb-config/debian/bullseye/deb_folder/source/format
similarity index 100%
rename from base/pf-bb-config/debian/deb_folder/source/format
rename to base/pf-bb-config/debian/bullseye/deb_folder/source/format
diff --git a/base/pf-bb-config/debian/meta_data.yaml b/base/pf-bb-config/debian/bullseye/meta_data.yaml
similarity index 100%
rename from base/pf-bb-config/debian/meta_data.yaml
rename to base/pf-bb-config/debian/bullseye/meta_data.yaml
diff --git a/base/stalld/debian/deb_folder/changelog b/base/stalld/debian/bullseye/deb_folder/changelog
similarity index 100%
rename from base/stalld/debian/deb_folder/changelog
rename to base/stalld/debian/bullseye/deb_folder/changelog
diff --git a/base/stalld/debian/deb_folder/control b/base/stalld/debian/bullseye/deb_folder/control
similarity index 100%
rename from base/stalld/debian/deb_folder/control
rename to base/stalld/debian/bullseye/deb_folder/control
diff --git a/base/stalld/debian/deb_folder/copyright b/base/stalld/debian/bullseye/deb_folder/copyright
similarity index 100%
rename from base/stalld/debian/deb_folder/copyright
rename to base/stalld/debian/bullseye/deb_folder/copyright
diff --git a/base/stalld/debian/deb_folder/rules b/base/stalld/debian/bullseye/deb_folder/rules
similarity index 100%
rename from base/stalld/debian/deb_folder/rules
rename to base/stalld/debian/bullseye/deb_folder/rules
diff --git a/base/stalld/debian/deb_folder/source/format b/base/stalld/debian/bullseye/deb_folder/source/format
similarity index 100%
rename from base/stalld/debian/deb_folder/source/format
rename to base/stalld/debian/bullseye/deb_folder/source/format
diff --git a/base/stalld/debian/meta_data.yaml b/base/stalld/debian/bullseye/meta_data.yaml
similarity index 100%
rename from base/stalld/debian/meta_data.yaml
rename to base/stalld/debian/bullseye/meta_data.yaml
diff --git a/base/stalld/debian/patches/0001-Build-and-compatibility-for-StarlingX.patch b/base/stalld/debian/bullseye/patches/0001-Build-and-compatibility-for-StarlingX.patch
similarity index 100%
rename from base/stalld/debian/patches/0001-Build-and-compatibility-for-StarlingX.patch
rename to base/stalld/debian/bullseye/patches/0001-Build-and-compatibility-for-StarlingX.patch
diff --git a/base/stalld/debian/patches/series b/base/stalld/debian/bullseye/patches/series
similarity index 100%
rename from base/stalld/debian/patches/series
rename to base/stalld/debian/bullseye/patches/series
diff --git a/base/synce4l/debian/deb_folder/changelog b/base/synce4l/debian/bullseye/deb_folder/changelog
similarity index 100%
rename from base/synce4l/debian/deb_folder/changelog
rename to base/synce4l/debian/bullseye/deb_folder/changelog
diff --git a/base/synce4l/debian/deb_folder/control b/base/synce4l/debian/bullseye/deb_folder/control
similarity index 100%
rename from base/synce4l/debian/deb_folder/control
rename to base/synce4l/debian/bullseye/deb_folder/control
diff --git a/base/synce4l/debian/deb_folder/copyright b/base/synce4l/debian/bullseye/deb_folder/copyright
similarity index 100%
rename from base/synce4l/debian/deb_folder/copyright
rename to base/synce4l/debian/bullseye/deb_folder/copyright
diff --git a/base/synce4l/debian/deb_folder/rules b/base/synce4l/debian/bullseye/deb_folder/rules
similarity index 100%
rename from base/synce4l/debian/deb_folder/rules
rename to base/synce4l/debian/bullseye/deb_folder/rules
diff --git a/base/synce4l/debian/deb_folder/source/format b/base/synce4l/debian/bullseye/deb_folder/source/format
similarity index 100%
rename from base/synce4l/debian/deb_folder/source/format
rename to base/synce4l/debian/bullseye/deb_folder/source/format
diff --git a/base/synce4l/debian/deb_folder/synce4l.install b/base/synce4l/debian/bullseye/deb_folder/synce4l.install
similarity index 100%
rename from base/synce4l/debian/deb_folder/synce4l.install
rename to base/synce4l/debian/bullseye/deb_folder/synce4l.install
diff --git a/base/synce4l/debian/meta_data.yaml b/base/synce4l/debian/bullseye/meta_data.yaml
similarity index 100%
rename from base/synce4l/debian/meta_data.yaml
rename to base/synce4l/debian/bullseye/meta_data.yaml
diff --git a/base/systemd/debian/deb_patches/0001-Update-symbols-file-for-libsystemd0.patch b/base/systemd/debian/bullseye/deb_patches/0001-Update-symbols-file-for-libsystemd0.patch
similarity index 100%
rename from base/systemd/debian/deb_patches/0001-Update-symbols-file-for-libsystemd0.patch
rename to base/systemd/debian/bullseye/deb_patches/0001-Update-symbols-file-for-libsystemd0.patch
diff --git a/base/systemd/debian/deb_patches/0002-systemd-add-dependency-on-rsync.patch b/base/systemd/debian/bullseye/deb_patches/0002-systemd-add-dependency-on-rsync.patch
similarity index 100%
rename from base/systemd/debian/deb_patches/0002-systemd-add-dependency-on-rsync.patch
rename to base/systemd/debian/bullseye/deb_patches/0002-systemd-add-dependency-on-rsync.patch
diff --git a/base/systemd/debian/deb_patches/series b/base/systemd/debian/bullseye/deb_patches/series
similarity index 100%
rename from base/systemd/debian/deb_patches/series
rename to base/systemd/debian/bullseye/deb_patches/series
diff --git a/base/systemd/debian/meta_data.yaml b/base/systemd/debian/bullseye/meta_data.yaml
similarity index 100%
rename from base/systemd/debian/meta_data.yaml
rename to base/systemd/debian/bullseye/meta_data.yaml
diff --git a/base/systemd/debian/patches/0014-Introduce-and-use-custom-NIC-naming-scheme.patch b/base/systemd/debian/bullseye/patches/0014-Introduce-and-use-custom-NIC-naming-scheme.patch
similarity index 100%
rename from base/systemd/debian/patches/0014-Introduce-and-use-custom-NIC-naming-scheme.patch
rename to base/systemd/debian/bullseye/patches/0014-Introduce-and-use-custom-NIC-naming-scheme.patch
diff --git a/base/systemd/debian/patches/0015-Port-udev-old-sas-paths-creation-from-RHEL.patch b/base/systemd/debian/bullseye/patches/0015-Port-udev-old-sas-paths-creation-from-RHEL.patch
similarity index 100%
rename from base/systemd/debian/patches/0015-Port-udev-old-sas-paths-creation-from-RHEL.patch
rename to base/systemd/debian/bullseye/patches/0015-Port-udev-old-sas-paths-creation-from-RHEL.patch
diff --git a/base/systemd/debian/patches/851-inject-millisec-in-syslog-date.patch b/base/systemd/debian/bullseye/patches/851-inject-millisec-in-syslog-date.patch
similarity index 100%
rename from base/systemd/debian/patches/851-inject-millisec-in-syslog-date.patch
rename to base/systemd/debian/bullseye/patches/851-inject-millisec-in-syslog-date.patch
diff --git a/base/systemd/debian/patches/909-sd-event-split-clock-data-allocation-out-of-sd_event.patch b/base/systemd/debian/bullseye/patches/909-sd-event-split-clock-data-allocation-out-of-sd_event.patch
similarity index 100%
rename from base/systemd/debian/patches/909-sd-event-split-clock-data-allocation-out-of-sd_event.patch
rename to base/systemd/debian/bullseye/patches/909-sd-event-split-clock-data-allocation-out-of-sd_event.patch
diff --git a/base/systemd/debian/patches/910-sd-event-split-out-code-to-add-remove-timer-event-so.patch b/base/systemd/debian/bullseye/patches/910-sd-event-split-out-code-to-add-remove-timer-event-so.patch
similarity index 100%
rename from base/systemd/debian/patches/910-sd-event-split-out-code-to-add-remove-timer-event-so.patch
rename to base/systemd/debian/bullseye/patches/910-sd-event-split-out-code-to-add-remove-timer-event-so.patch
diff --git a/base/systemd/debian/patches/913-sd-event-remove-earliest_index-latest_index-into-com.patch b/base/systemd/debian/bullseye/patches/913-sd-event-remove-earliest_index-latest_index-into-com.patch
similarity index 100%
rename from base/systemd/debian/patches/913-sd-event-remove-earliest_index-latest_index-into-com.patch
rename to base/systemd/debian/bullseye/patches/913-sd-event-remove-earliest_index-latest_index-into-com.patch
diff --git a/base/systemd/debian/patches/919-sd-event-add-ability-to-ratelimit-event-sources.patch b/base/systemd/debian/bullseye/patches/919-sd-event-add-ability-to-ratelimit-event-sources.patch
similarity index 100%
rename from base/systemd/debian/patches/919-sd-event-add-ability-to-ratelimit-event-sources.patch
rename to base/systemd/debian/bullseye/patches/919-sd-event-add-ability-to-ratelimit-event-sources.patch
diff --git a/base/systemd/debian/patches/920-core-prevent-excessive-proc-self-mountinfo-parsing.patch b/base/systemd/debian/bullseye/patches/920-core-prevent-excessive-proc-self-mountinfo-parsing.patch
similarity index 100%
rename from base/systemd/debian/patches/920-core-prevent-excessive-proc-self-mountinfo-parsing.patch
rename to base/systemd/debian/bullseye/patches/920-core-prevent-excessive-proc-self-mountinfo-parsing.patch
diff --git a/base/systemd/debian/patches/922-sd-event-change-ordering-of-pending-ratelimited-even.patch b/base/systemd/debian/bullseye/patches/922-sd-event-change-ordering-of-pending-ratelimited-even.patch
similarity index 100%
rename from base/systemd/debian/patches/922-sd-event-change-ordering-of-pending-ratelimited-even.patch
rename to base/systemd/debian/bullseye/patches/922-sd-event-change-ordering-of-pending-ratelimited-even.patch
diff --git a/base/systemd/debian/patches/923-sd-event-drop-unnecessary-else.patch b/base/systemd/debian/bullseye/patches/923-sd-event-drop-unnecessary-else.patch
similarity index 100%
rename from base/systemd/debian/patches/923-sd-event-drop-unnecessary-else.patch
rename to base/systemd/debian/bullseye/patches/923-sd-event-drop-unnecessary-else.patch
diff --git a/base/systemd/debian/patches/924-sd-event-use-CMP-macro.patch b/base/systemd/debian/bullseye/patches/924-sd-event-use-CMP-macro.patch
similarity index 100%
rename from base/systemd/debian/patches/924-sd-event-use-CMP-macro.patch
rename to base/systemd/debian/bullseye/patches/924-sd-event-use-CMP-macro.patch
diff --git a/base/systemd/debian/patches/925-sd-event-use-usec_add.patch b/base/systemd/debian/bullseye/patches/925-sd-event-use-usec_add.patch
similarity index 100%
rename from base/systemd/debian/patches/925-sd-event-use-usec_add.patch
rename to base/systemd/debian/bullseye/patches/925-sd-event-use-usec_add.patch
diff --git a/base/systemd/debian/patches/926-sd-event-make-event_source_time_prioq_reshuffle-acce.patch b/base/systemd/debian/bullseye/patches/926-sd-event-make-event_source_time_prioq_reshuffle-acce.patch
similarity index 100%
rename from base/systemd/debian/patches/926-sd-event-make-event_source_time_prioq_reshuffle-acce.patch
rename to base/systemd/debian/bullseye/patches/926-sd-event-make-event_source_time_prioq_reshuffle-acce.patch
diff --git a/base/systemd/debian/patches/927-sd-event-always-reshuffle-time-prioq-on-changing-onl.patch b/base/systemd/debian/bullseye/patches/927-sd-event-always-reshuffle-time-prioq-on-changing-onl.patch
similarity index 100%
rename from base/systemd/debian/patches/927-sd-event-always-reshuffle-time-prioq-on-changing-onl.patch
rename to base/systemd/debian/bullseye/patches/927-sd-event-always-reshuffle-time-prioq-on-changing-onl.patch
diff --git a/base/systemd/debian/patches/928-change-operator-combining-bools-from-to-and.patch b/base/systemd/debian/bullseye/patches/928-change-operator-combining-bools-from-to-and.patch
similarity index 100%
rename from base/systemd/debian/patches/928-change-operator-combining-bools-from-to-and.patch
rename to base/systemd/debian/bullseye/patches/928-change-operator-combining-bools-from-to-and.patch
diff --git a/base/systemd/debian/patches/929-Core-shorten-long-unit-names.patch b/base/systemd/debian/bullseye/patches/929-Core-shorten-long-unit-names.patch
similarity index 100%
rename from base/systemd/debian/patches/929-Core-shorten-long-unit-names.patch
rename to base/systemd/debian/bullseye/patches/929-Core-shorten-long-unit-names.patch
diff --git a/base/systemd/debian/patches/disable-default-presets.patch b/base/systemd/debian/bullseye/patches/disable-default-presets.patch
similarity index 100%
rename from base/systemd/debian/patches/disable-default-presets.patch
rename to base/systemd/debian/bullseye/patches/disable-default-presets.patch
diff --git a/base/systemd/debian/patches/series b/base/systemd/debian/bullseye/patches/series
similarity index 100%
rename from base/systemd/debian/patches/series
rename to base/systemd/debian/bullseye/patches/series
diff --git a/base/systemd/debian/patches/skip-some-testcases.patch b/base/systemd/debian/bullseye/patches/skip-some-testcases.patch
similarity index 100%
rename from base/systemd/debian/patches/skip-some-testcases.patch
rename to base/systemd/debian/bullseye/patches/skip-some-testcases.patch
diff --git a/base/watchdog/debian/dl_hook b/base/watchdog/debian/bullseye/dl_hook
similarity index 100%
rename from base/watchdog/debian/dl_hook
rename to base/watchdog/debian/bullseye/dl_hook
diff --git a/base/watchdog/debian/meta_data.yaml b/base/watchdog/debian/bullseye/meta_data.yaml
similarity index 100%
rename from base/watchdog/debian/meta_data.yaml
rename to base/watchdog/debian/bullseye/meta_data.yaml