diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py index f6e4b9a8e..14e698799 100755 --- a/debian/bin/gencontrol.py +++ b/debian/bin/gencontrol.py @@ -86,6 +86,62 @@ class Gencontrol(Base): # Prepare to generate debian/tests/control self.tests_control = None + self.installer_packages = {} + + if os.getenv('DEBIAN_KERNEL_DISABLE_INSTALLER'): + if self.changelog[0].distribution == 'UNRELEASED': + import warnings + warnings.warn('Disable installer modules on request (DEBIAN_KERNEL_DISABLE_INSTALLER set)') + else: + raise RuntimeError('Unable to disable installer modules in release build (DEBIAN_KERNEL_DISABLE_INSTALLER set)') + elif self.config.merge('packages').get('installer', True): + # Add udebs using kernel-wedge + kw_env = os.environ.copy() + kw_env['KW_DEFCONFIG_DIR'] = 'debian/installer' + kw_env['KW_CONFIG_DIR'] = 'debian/installer' + kw_proc = subprocess.Popen( + ['kernel-wedge', 'gen-control', vars['abiname']], + stdout=subprocess.PIPE, + env=kw_env) + if not isinstance(kw_proc.stdout, io.IOBase): + udeb_packages = read_control(io.open(kw_proc.stdout.fileno(), closefd=False)) + else: + udeb_packages = read_control(io.TextIOWrapper(kw_proc.stdout)) + kw_proc.wait() + if kw_proc.returncode != 0: + raise RuntimeError('kernel-wedge exited with code %d' % + kw_proc.returncode) + + # All architectures that have some installer udebs + arches = set() + for package in udeb_packages: + arches.update(package['Architecture']) + + # Code-signing status for those architectures + # If we're going to build signed udebs later, don't actually + # generate udebs. Just test that we *can* build, so we find + # configuration errors before building linux-signed. + build_signed = {} + for arch in arches: + build_signed[arch] = (self.config.merge('build', arch) + .get('signed-code', False)) + + for package in udeb_packages: + # kernel-wedge currently chokes on Build-Profiles so add it now + if any(build_signed[arch] for arch in package['Architecture']): + assert all(build_signed[arch] + for arch in package['Architecture']) + # XXX This is a hack to exclude the udebs from + # the package list while still being able to + # convince debhelper and kernel-wedge to go + # part way to building them. + package['Build-Profiles'] = '' + else: + package['Build-Profiles'] = '' + + for arch in package['Architecture']: + self.installer_packages.setdefault(arch, []).append(package) + def do_main_makefile(self, makefile, makeflags, extra): fs_enabled = [featureset for featureset in self.config['base', ]['featuresets'] @@ -220,61 +276,20 @@ class Gencontrol(Base): ["$(MAKE) -f debian/rules.real install-libc-dev_%s %s" % (arch, makeflags)]) - if os.getenv('DEBIAN_KERNEL_DISABLE_INSTALLER'): - if self.changelog[0].distribution == 'UNRELEASED': - import warnings - warnings.warn('Disable installer modules on request (DEBIAN_KERNEL_DISABLE_INSTALLER set)') - else: - raise RuntimeError('Unable to disable installer modules in release build (DEBIAN_KERNEL_DISABLE_INSTALLER set)') - elif self.config.merge('packages').get('installer', True): - # Add udebs using kernel-wedge - installer_def_dir = 'debian/installer' - installer_arch_dir = os.path.join(installer_def_dir, arch) - if os.path.isdir(installer_arch_dir): - kw_env = os.environ.copy() - kw_env['KW_DEFCONFIG_DIR'] = installer_def_dir - kw_env['KW_CONFIG_DIR'] = installer_arch_dir - kw_proc = subprocess.Popen( - ['kernel-wedge', 'gen-control', vars['abiname']], - stdout=subprocess.PIPE, - env=kw_env) - if not isinstance(kw_proc.stdout, io.IOBase): - udeb_packages = read_control(io.open(kw_proc.stdout.fileno(), closefd=False)) - else: - udeb_packages = read_control(io.TextIOWrapper(kw_proc.stdout)) - kw_proc.wait() - if kw_proc.returncode != 0: - raise RuntimeError('kernel-wedge exited with code %d' % - kw_proc.returncode) + udeb_packages = self.installer_packages.get(arch, []) + if udeb_packages: + merge_packages(packages, udeb_packages, arch) - # If we're going to build signed udebs later, don't actually - # generate udebs. Just test that we *can* build, so we find - # configuration errors before building linux-signed. - - # kernel-wedge currently chokes on Build-Profiles so add it now - for package in udeb_packages: - if build_signed: - # XXX This is a hack to exclude the udebs from - # the package list while still being able to - # convince debhelper and kernel-wedge to go - # part way to building them. - package['Build-Profiles'] = '' - else: - package['Build-Profiles'] = '' - - merge_packages(packages, udeb_packages, arch) - - # These packages must be built after the per-flavour/ - # per-featureset packages. Also, this won't work - # correctly with an empty package list. - if udeb_packages: - makefile.add( - 'binary-arch_%s' % arch, - cmds=["$(MAKE) -f debian/rules.real install-udeb_%s %s " - "PACKAGE_NAMES='%s' UDEB_UNSIGNED_TEST_BUILD=%s" % - (arch, makeflags, - ' '.join(p['Package'] for p in udeb_packages), - build_signed)]) + # These packages must be built after the per-flavour/ + # per-featureset packages. Also, this won't work + # correctly with an empty package list. + makefile.add( + 'binary-arch_%s' % arch, + cmds=["$(MAKE) -f debian/rules.real install-udeb_%s %s " + "PACKAGE_NAMES='%s' UDEB_UNSIGNED_TEST_BUILD=%s" % + (arch, makeflags, + ' '.join(p['Package'] for p in udeb_packages), + build_signed)]) # This also needs to be built after the per-flavour/per-featureset # packages. diff --git a/debian/bin/gencontrol_signed.py b/debian/bin/gencontrol_signed.py index 06a542944..bf807c55c 100755 --- a/debian/bin/gencontrol_signed.py +++ b/debian/bin/gencontrol_signed.py @@ -54,6 +54,37 @@ class Gencontrol(Base): '-v%(imagebinaryversion)s -DBuilt-Using="linux (= %(imagesourceversion)s)"' % vars) makeflags['PACKAGE_VERSION'] = vars['imagebinaryversion'] + self.installer_packages = {} + + if os.getenv('DEBIAN_KERNEL_DISABLE_INSTALLER'): + if self.changelog[0].distribution == 'UNRELEASED': + import warnings + warnings.warn('Disable installer modules on request (DEBIAN_KERNEL_DISABLE_INSTALLER set)') + else: + raise RuntimeError('Unable to disable installer modules in release build (DEBIAN_KERNEL_DISABLE_INSTALLER set)') + elif self.config.merge('packages').get('installer', True): + # Add udebs using kernel-wedge + kw_env = os.environ.copy() + kw_env['KW_DEFCONFIG_DIR'] = 'debian/installer' + kw_env['KW_CONFIG_DIR'] = 'debian/installer' + kw_proc = subprocess.Popen( + ['kernel-wedge', 'gen-control', vars['abiname']], + stdout=subprocess.PIPE, + env=kw_env) + if not isinstance(kw_proc.stdout, io.IOBase): + udeb_packages = read_control(io.open(kw_proc.stdout.fileno(), closefd=False)) + else: + udeb_packages = read_control(io.TextIOWrapper(kw_proc.stdout)) + kw_proc.wait() + if kw_proc.returncode != 0: + raise RuntimeError('kernel-wedge exited with code %d' % + kw_proc.returncode) + + for package in udeb_packages: + for arch in package['Architecture']: + if self.config.merge('build', arch).get('signed-code', False): + self.installer_packages.setdefault(arch, []).append(package) + def do_main_packages(self, packages, vars, makeflags, extra): # Assume that arch:all packages do not get binNMU'd packages['source']['Build-Depends'].append( @@ -77,46 +108,20 @@ class Gencontrol(Base): self.config['version', ]['abiname_base'] + abiname_part def do_arch_packages(self, packages, makefile, arch, vars, makeflags, extra): - if os.getenv('DEBIAN_KERNEL_DISABLE_INSTALLER'): - if self.changelog[0].distribution == 'UNRELEASED': - import warnings - warnings.warn('Disable installer modules on request (DEBIAN_KERNEL_DISABLE_INSTALLER set)') - else: - raise RuntimeError('Unable to disable installer modules in release build (DEBIAN_KERNEL_DISABLE_INSTALLER set)') - elif (self.config.merge('packages').get('installer', True) and - self.config.merge('build', arch).get('signed-code', False)): - # Add udebs using kernel-wedge - installer_def_dir = 'debian/installer' - installer_arch_dir = os.path.join(installer_def_dir, arch) - if os.path.isdir(installer_arch_dir): - kw_env = os.environ.copy() - kw_env['KW_DEFCONFIG_DIR'] = installer_def_dir - kw_env['KW_CONFIG_DIR'] = installer_arch_dir - kw_proc = subprocess.Popen( - ['kernel-wedge', 'gen-control', vars['abiname']], - stdout=subprocess.PIPE, - env=kw_env) - if not isinstance(kw_proc.stdout, io.IOBase): - udeb_packages = read_control(io.open(kw_proc.stdout.fileno(), closefd=False)) - else: - udeb_packages = read_control(io.TextIOWrapper(kw_proc.stdout)) - kw_proc.wait() - if kw_proc.returncode != 0: - raise RuntimeError('kernel-wedge exited with code %d' % - kw_proc.returncode) + udeb_packages = self.installer_packages.get(arch, []) + if udeb_packages: + merge_packages(packages, udeb_packages, arch) - merge_packages(packages, udeb_packages, arch) - - # These packages must be built after the per-flavour/ - # per-featureset packages. Also, this won't work - # correctly with an empty package list. - if udeb_packages: - makefile.add( - 'binary-arch_%s' % arch, - cmds=["$(MAKE) -f debian/rules.real install-udeb_%s %s " - "PACKAGE_NAMES='%s'" % - (arch, makeflags, - ' '.join(p['Package'] for p in udeb_packages))]) + # These packages must be built after the per-flavour/ + # per-featureset packages. Also, this won't work + # correctly with an empty package list. + if udeb_packages: + makefile.add( + 'binary-arch_%s' % arch, + cmds=["$(MAKE) -f debian/rules.real install-udeb_%s %s " + "PACKAGE_NAMES='%s'" % + (arch, makeflags, + ' '.join(p['Package'] for p in udeb_packages))]) def do_flavour_setup(self, vars, makeflags, arch, featureset, flavour, extra): super(Gencontrol, self).do_flavour_setup(vars, makeflags, arch, featureset, flavour, extra) diff --git a/debian/changelog b/debian/changelog index 010b2cfc9..671d63a6f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ linux (4.19~rc1-1~exp1) UNRELEASED; urgency=medium * [hppa] debian/control: Simplify build-dependencies for 64-bit toolchain * Compile with gcc-8 on all architectures * [x86] Allow generating user-space headers without a compiler + * udeb: Merge configuration directories and files across architectures -- Ben Hutchings Mon, 27 Aug 2018 14:36:54 +0100 diff --git a/debian/installer/alpha/kernel-versions b/debian/installer/alpha/kernel-versions deleted file mode 100644 index 1a479fb20..000000000 --- a/debian/installer/alpha/kernel-versions +++ /dev/null @@ -1,2 +0,0 @@ -# arch version flavour installedname suffix build-depends -alpha - alpha-generic - y - diff --git a/debian/installer/alpha/package-list b/debian/installer/alpha/package-list deleted file mode 100644 index d33320790..000000000 --- a/debian/installer/alpha/package-list +++ /dev/null @@ -1,22 +0,0 @@ -# This file is used to build up the control file. The kernel version and -# "-di" are appended to the package names. Section can be left out. So can -# architecture, which is derived from the files in the modules directory. -# It overwrites specifications from /usr/share/kernel-wedge/package-list. -# -Package: kernel-image - -Package: usb-storage-modules -Depends: kernel-image, scsi-modules, usb-modules - -Package: pata-modules -Depends: kernel-image, ata-modules, scsi-core-modules - -Package: fb-modules -Depends: kernel-image, i2c-modules - -Package: srm-modules -Depends: kernel-image -Priority: standard -Description: SRM modules - This package contains the srm_env module which provides access to the SRM - environment. diff --git a/debian/installer/amd64/TODO b/debian/installer/amd64/TODO deleted file mode 100644 index d02dd6c7d..000000000 --- a/debian/installer/amd64/TODO +++ /dev/null @@ -1,3 +0,0 @@ -* The 2.6 kernel is missing a lot of modules, need to get a list of all - modules included in the udebs, and compare vs. the full module list and - add missing stuff. diff --git a/debian/installer/amd64/kernel-versions b/debian/installer/amd64/kernel-versions deleted file mode 100644 index 1700a9426..000000000 --- a/debian/installer/amd64/kernel-versions +++ /dev/null @@ -1,2 +0,0 @@ -# arch version flavour installedname suffix build-depends -amd64 - amd64 - - - diff --git a/debian/installer/amd64/package-list b/debian/installer/amd64/package-list deleted file mode 100644 index e55a71031..000000000 --- a/debian/installer/amd64/package-list +++ /dev/null @@ -1,14 +0,0 @@ -# This file is used to build up the control file. The kernel version and -# "-di" are appended to the package names. Section can be left out. So can -# architecture, which is derived from the files in the modules directory. -# It overwrites specifications from /usr/share/kernel-wedge/package-list. -# - -Package: fat-modules -Priority: standard - -Package: scsi-modules -Depends: kernel-image, scsi-core-modules, cdrom-core-modules, core-modules, ata-modules - -Package: kernel-image -Provides: zlib-modules diff --git a/debian/installer/arm64/kernel-versions b/debian/installer/arm64/kernel-versions deleted file mode 100644 index 11d739954..000000000 --- a/debian/installer/arm64/kernel-versions +++ /dev/null @@ -1,2 +0,0 @@ -# arch version flavour installedname suffix build-depends -arm64 - arm64 - - - diff --git a/debian/installer/arm64/package-list b/debian/installer/arm64/package-list deleted file mode 100644 index 22daaa6cc..000000000 --- a/debian/installer/arm64/package-list +++ /dev/null @@ -1,8 +0,0 @@ -# This file is used to build up the control file. The kernel version and -# "-di" are appended to the package names. Section can be left out. So can -# architecture, which is derived from the files in the modules directory. -# It overwrites specifications from /usr/share/kernel-wedge/package-list. -# - -Package: kernel-image -Provides: zlib-modules diff --git a/debian/installer/armel/kernel-versions b/debian/installer/armel/kernel-versions deleted file mode 100644 index 49eb64629..000000000 --- a/debian/installer/armel/kernel-versions +++ /dev/null @@ -1,2 +0,0 @@ -# arch version flavour installedname suffix build-depends -armel - marvell - y - diff --git a/debian/installer/armel/package-list b/debian/installer/armel/package-list deleted file mode 100644 index 9c8aabcdf..000000000 --- a/debian/installer/armel/package-list +++ /dev/null @@ -1,14 +0,0 @@ -# This file is used to build up the control file. The kernel version and -# "-di" are appended to the package names. Section can be left out. So can -# architecture, which is derived from the files in the modules directory. -# It overwrites specifications from /usr/share/kernel-wedge/package-list. -# -Package: kernel-image -Provides_marvell: rtc-modules -Provides_versatile: rtc-modules - -Package: fb-modules -Depends: kernel-image, usb-modules - -Package: jffs2-modules -Depends: kernel-image, zlib-modules, compress-modules, mtd-modules diff --git a/debian/installer/armhf/kernel-versions b/debian/installer/armhf/kernel-versions deleted file mode 100644 index c73dcc7a4..000000000 --- a/debian/installer/armhf/kernel-versions +++ /dev/null @@ -1,2 +0,0 @@ -# arch version flavour installedname suffix build-depends -armhf - armmp - - - diff --git a/debian/installer/armhf/package-list b/debian/installer/armhf/package-list deleted file mode 100644 index bc7a587d1..000000000 --- a/debian/installer/armhf/package-list +++ /dev/null @@ -1,9 +0,0 @@ -# This file is used to build up the control file. The kernel version and -# "-di" are appended to the package names. Section can be left out. So can -# architecture, which is derived from the files in the modules directory. -# It overwrites specifications from /usr/share/kernel-wedge/package-list. -# -Package: kernel-image - -Package: pata-modules -Priority: optional diff --git a/debian/installer/hppa/kernel-versions b/debian/installer/hppa/kernel-versions deleted file mode 100644 index e59e12c0a..000000000 --- a/debian/installer/hppa/kernel-versions +++ /dev/null @@ -1,3 +0,0 @@ -# arch version flavour installedname suffix build-depends -hppa - parisc - y - -hppa - parisc64-smp - y - diff --git a/debian/installer/hppa/package-list b/debian/installer/hppa/package-list deleted file mode 100644 index ef7512943..000000000 --- a/debian/installer/hppa/package-list +++ /dev/null @@ -1,17 +0,0 @@ -# This file is used to build up the control file. The kernel version and -# "-di" are appended to the package names. Section can be left out. So can -# architecture, which is derived from the files in the modules directory. -# It overwrites specifications from /usr/share/kernel-wedge/package-list. -# -Package: kernel-image -Provides_parisc64-smp: i2c-modules - -Package: usb-storage-modules -Depends: kernel-image, scsi-modules, usb-modules - -Package: pata-modules -Depends: kernel-image, ata-modules, scsi-core-modules - -Package: fb-modules -Depends: kernel-image -Priority: standard diff --git a/debian/installer/i386/kernel-versions b/debian/installer/i386/kernel-versions deleted file mode 100644 index c08de1444..000000000 --- a/debian/installer/i386/kernel-versions +++ /dev/null @@ -1,3 +0,0 @@ -# arch version flavour installedname suffix build-depends -i386 - 686 - - - -i386 - 686-pae - - - diff --git a/debian/installer/i386/package-list b/debian/installer/i386/package-list deleted file mode 100644 index b92d69595..000000000 --- a/debian/installer/i386/package-list +++ /dev/null @@ -1,14 +0,0 @@ -# This file is used to build up the control file. The kernel version and -# "-di" are appended to the package names. Section can be left out. So can -# architecture, which is derived from the files in the modules directory. -# It overwrites specifications from /usr/share/kernel-wedge/package-list. -# - -Package: kernel-image -Provides: rtc-modules, zlib-modules - -Package: fat-modules -Priority: standard - -Package: fb-modules -Depends: kernel-image, i2c-modules diff --git a/debian/installer/ia64/TODO b/debian/installer/ia64/TODO deleted file mode 100644 index d02dd6c7d..000000000 --- a/debian/installer/ia64/TODO +++ /dev/null @@ -1,3 +0,0 @@ -* The 2.6 kernel is missing a lot of modules, need to get a list of all - modules included in the udebs, and compare vs. the full module list and - add missing stuff. diff --git a/debian/installer/ia64/kernel-versions b/debian/installer/ia64/kernel-versions deleted file mode 100644 index 24043ff95..000000000 --- a/debian/installer/ia64/kernel-versions +++ /dev/null @@ -1,2 +0,0 @@ -# arch version flavour installedname suffix build-depends -ia64 - itanium - - - diff --git a/debian/installer/ia64/package-list b/debian/installer/ia64/package-list deleted file mode 100644 index 3c34246cb..000000000 --- a/debian/installer/ia64/package-list +++ /dev/null @@ -1,34 +0,0 @@ -# This file is used to build up the control file. The kernel version and -# "-di" are appended to the package names. Section can be left out. So can -# architecture, which is derived from the files in the modules directory. -# It overwrites specifications from /usr/share/kernel-wedge/package-list. -# -Package: fat-modules -Priority: standard - -Package: ide-core-modules -Depends: kernel-image -Priority: standard -Description: IDE support - This package contains core IDE support for the kernel. - -Package: ide-modules -Depends: kernel-image, ide-core-modules, sn-modules -Priority: standard -Description: IDE drivers - This package contains IDE drivers for the kernel. - -Package: cdrom-core-modules -Depends: kernel-image, scsi-core-modules, ide-modules, isofs-modules - -Package: serial-modules -Depends: kernel-image, pcmcia-modules, sn-modules - -Package: sn-modules -Depends: kernel-image -Priority: extra -Description: SN modules - This package contains SN modules for Altix systems - -Package: kernel-image -Provides: efi-modules, zlib-modules diff --git a/debian/installer/kernel-versions b/debian/installer/kernel-versions new file mode 100644 index 000000000..5f64b533e --- /dev/null +++ b/debian/installer/kernel-versions @@ -0,0 +1,34 @@ +# arch version flavour installedname suffix build-depends +alpha - alpha-generic - y - +amd64 - amd64 - - - +arm64 - arm64 - - - +armel - marvell - y - +armhf - armmp - - - +hppa - parisc - y - +hppa - parisc64-smp - y - +i386 - 686 - - - +i386 - 686-pae - - - +ia64 - itanium - - - +m68k - m68k - y - +mips - 4kc-malta - y - +mips - octeon - y - +mips64 - 5kc-malta - y - +mips64 - octeon - y - +mips64el - 5kc-malta - y - +mips64el - loongson-3 - y - +mips64el - octeon - y - +mips64r6 - mips64r6 - y - +mips64r6el - mips64r6el - y - +mipsel - 4kc-malta - y - +mipsel - loongson-3 - y - +mipsel - octeon - y - +mipsr6 - mips32r6 - y - +mipsr6el - mips32r6el - y - +powerpc - powerpc - - - +powerpc - powerpc64 - - - +ppc64 - powerpc64 - - - +ppc64el - powerpc64le - - - +s390x - s390x - - - +sh4 - sh7751r - y - +sh4 - sh7785lcr - y - +sparc64 - sparc64 - y - diff --git a/debian/installer/m68k/kernel-versions b/debian/installer/m68k/kernel-versions deleted file mode 100644 index ec5f9d3c4..000000000 --- a/debian/installer/m68k/kernel-versions +++ /dev/null @@ -1,2 +0,0 @@ -# arch version flavour installedname suffix build-depends -m68k - m68k - y - diff --git a/debian/installer/m68k/package-list b/debian/installer/m68k/package-list deleted file mode 100644 index fab89fd0c..000000000 --- a/debian/installer/m68k/package-list +++ /dev/null @@ -1,21 +0,0 @@ -# This file is used to build up the control file. The kernel version and -# "-di" are appended to the package names. Section can be left out. So can -# architecture, which is derived from the files in the modules directory. -# It overwrites specifications from /usr/share/kernel-wedge/package-list. -# - -Package: cdrom-core-modules -Depends: kernel-image, scsi-core-modules, ide-modules, isofs-modules - This package contains core CDROM support for the kernel. - -Package: ide-core-modules -Depends: kernel-image -Priority: standard -Description: IDE support - This package contains core IDE support for the kernel. - -Package: ide-modules -Depends: kernel-image, ide-core-modules -Priority: standard -Description: IDE drivers - This package contains IDE drivers for the kernel. diff --git a/debian/installer/mips/kernel-versions b/debian/installer/mips/kernel-versions deleted file mode 100644 index 4bc557556..000000000 --- a/debian/installer/mips/kernel-versions +++ /dev/null @@ -1,3 +0,0 @@ -# arch version flavour installedname suffix build-depends -mips - 4kc-malta - y - -mips - octeon - y - diff --git a/debian/installer/mips/package-list b/debian/installer/mips/package-list deleted file mode 100644 index b7141bb20..000000000 --- a/debian/installer/mips/package-list +++ /dev/null @@ -1,7 +0,0 @@ -# This file is used to build up the control file. The kernel version and -# "-di" are appended to the package names. Section can be left out. So can -# architecture, which is derived from the files in the modules directory. -# It overwrites specifications from /usr/share/kernel-wedge/package-list. -# -Package: kernel-image -Provides: rtc-modules diff --git a/debian/installer/mips64/kernel-versions b/debian/installer/mips64/kernel-versions deleted file mode 100644 index 24a6c52af..000000000 --- a/debian/installer/mips64/kernel-versions +++ /dev/null @@ -1,3 +0,0 @@ -# arch version flavour installedname suffix build-depends -mips64 - 5kc-malta - y - -mips64 - octeon - y - diff --git a/debian/installer/mips64/modules/mips64 b/debian/installer/mips64/modules/mips64 deleted file mode 120000 index d3bf739f6..000000000 --- a/debian/installer/mips64/modules/mips64 +++ /dev/null @@ -1 +0,0 @@ -../../mips/modules/mips \ No newline at end of file diff --git a/debian/installer/mips64/modules/mips64-5kc-malta b/debian/installer/mips64/modules/mips64-5kc-malta deleted file mode 120000 index 84b512ec4..000000000 --- a/debian/installer/mips64/modules/mips64-5kc-malta +++ /dev/null @@ -1 +0,0 @@ -../../mips/modules/mips-4kc-malta \ No newline at end of file diff --git a/debian/installer/mips64/modules/mips64-octeon b/debian/installer/mips64/modules/mips64-octeon deleted file mode 120000 index da584c69b..000000000 --- a/debian/installer/mips64/modules/mips64-octeon +++ /dev/null @@ -1 +0,0 @@ -../../mips/modules/mips-octeon \ No newline at end of file diff --git a/debian/installer/mips64/package-list b/debian/installer/mips64/package-list deleted file mode 100644 index b7141bb20..000000000 --- a/debian/installer/mips64/package-list +++ /dev/null @@ -1,7 +0,0 @@ -# This file is used to build up the control file. The kernel version and -# "-di" are appended to the package names. Section can be left out. So can -# architecture, which is derived from the files in the modules directory. -# It overwrites specifications from /usr/share/kernel-wedge/package-list. -# -Package: kernel-image -Provides: rtc-modules diff --git a/debian/installer/mips64el/kernel-versions b/debian/installer/mips64el/kernel-versions deleted file mode 100644 index 7135f7480..000000000 --- a/debian/installer/mips64el/kernel-versions +++ /dev/null @@ -1,4 +0,0 @@ -# arch version flavour installedname suffix build-depends -mips64el - 5kc-malta - y - -mips64el - loongson-3 - y - -mips64el - octeon - y - diff --git a/debian/installer/mips64el/modules/mips64el-5kc-malta b/debian/installer/mips64el/modules/mips64el-5kc-malta deleted file mode 120000 index 84b512ec4..000000000 --- a/debian/installer/mips64el/modules/mips64el-5kc-malta +++ /dev/null @@ -1 +0,0 @@ -../../mips/modules/mips-4kc-malta \ No newline at end of file diff --git a/debian/installer/mips64el/modules/mips64el-loongson-3 b/debian/installer/mips64el/modules/mips64el-loongson-3 deleted file mode 120000 index 7f6e9670c..000000000 --- a/debian/installer/mips64el/modules/mips64el-loongson-3 +++ /dev/null @@ -1 +0,0 @@ -../../mipsel/modules/mipsel-loongson-3 \ No newline at end of file diff --git a/debian/installer/mips64el/modules/mips64el-octeon b/debian/installer/mips64el/modules/mips64el-octeon deleted file mode 120000 index da584c69b..000000000 --- a/debian/installer/mips64el/modules/mips64el-octeon +++ /dev/null @@ -1 +0,0 @@ -../../mips/modules/mips-octeon \ No newline at end of file diff --git a/debian/installer/mips64el/package-list b/debian/installer/mips64el/package-list deleted file mode 100644 index 621363abe..000000000 --- a/debian/installer/mips64el/package-list +++ /dev/null @@ -1,8 +0,0 @@ -# This file is used to build up the control file. The kernel version and -# "-di" are appended to the package names. Section can be left out. So can -# architecture, which is derived from the files in the modules directory. -# It overwrites specifications from /usr/share/kernel-wedge/package-list. -# -Package: kernel-image -Provides: rtc-modules -Provides_loongson-3: i2c-modules, rtc-modules diff --git a/debian/installer/mips64r6/kernel-versions b/debian/installer/mips64r6/kernel-versions deleted file mode 100644 index a4e378707..000000000 --- a/debian/installer/mips64r6/kernel-versions +++ /dev/null @@ -1,2 +0,0 @@ -# arch version flavour installedname suffix build-depends -mips64r6 - mips64r6 - y - diff --git a/debian/installer/mips64r6/modules/mips64r6 b/debian/installer/mips64r6/modules/mips64r6 deleted file mode 120000 index d3bf739f6..000000000 --- a/debian/installer/mips64r6/modules/mips64r6 +++ /dev/null @@ -1 +0,0 @@ -../../mips/modules/mips \ No newline at end of file diff --git a/debian/installer/mips64r6/package-list b/debian/installer/mips64r6/package-list deleted file mode 100644 index b7141bb20..000000000 --- a/debian/installer/mips64r6/package-list +++ /dev/null @@ -1,7 +0,0 @@ -# This file is used to build up the control file. The kernel version and -# "-di" are appended to the package names. Section can be left out. So can -# architecture, which is derived from the files in the modules directory. -# It overwrites specifications from /usr/share/kernel-wedge/package-list. -# -Package: kernel-image -Provides: rtc-modules diff --git a/debian/installer/mips64r6el/kernel-versions b/debian/installer/mips64r6el/kernel-versions deleted file mode 100644 index 802b414e2..000000000 --- a/debian/installer/mips64r6el/kernel-versions +++ /dev/null @@ -1,2 +0,0 @@ -# arch version flavour installedname suffix build-depends -mips64r6el - mips64r6el - y - diff --git a/debian/installer/mips64r6el/modules/mips64r6el b/debian/installer/mips64r6el/modules/mips64r6el deleted file mode 120000 index d3bf739f6..000000000 --- a/debian/installer/mips64r6el/modules/mips64r6el +++ /dev/null @@ -1 +0,0 @@ -../../mips/modules/mips \ No newline at end of file diff --git a/debian/installer/mips64r6el/package-list b/debian/installer/mips64r6el/package-list deleted file mode 100644 index b7141bb20..000000000 --- a/debian/installer/mips64r6el/package-list +++ /dev/null @@ -1,7 +0,0 @@ -# This file is used to build up the control file. The kernel version and -# "-di" are appended to the package names. Section can be left out. So can -# architecture, which is derived from the files in the modules directory. -# It overwrites specifications from /usr/share/kernel-wedge/package-list. -# -Package: kernel-image -Provides: rtc-modules diff --git a/debian/installer/mipsel/kernel-versions b/debian/installer/mipsel/kernel-versions deleted file mode 100644 index dcf35104b..000000000 --- a/debian/installer/mipsel/kernel-versions +++ /dev/null @@ -1,4 +0,0 @@ -# arch version flavour installedname suffix build-depends -mipsel - 4kc-malta - y - -mipsel - loongson-3 - y - -mipsel - octeon - y - diff --git a/debian/installer/mipsel/modules/mipsel-4kc-malta b/debian/installer/mipsel/modules/mipsel-4kc-malta deleted file mode 120000 index 84b512ec4..000000000 --- a/debian/installer/mipsel/modules/mipsel-4kc-malta +++ /dev/null @@ -1 +0,0 @@ -../../mips/modules/mips-4kc-malta \ No newline at end of file diff --git a/debian/installer/mipsel/modules/mipsel-octeon b/debian/installer/mipsel/modules/mipsel-octeon deleted file mode 120000 index da584c69b..000000000 --- a/debian/installer/mipsel/modules/mipsel-octeon +++ /dev/null @@ -1 +0,0 @@ -../../mips/modules/mips-octeon \ No newline at end of file diff --git a/debian/installer/mipsel/package-list b/debian/installer/mipsel/package-list deleted file mode 100644 index 621363abe..000000000 --- a/debian/installer/mipsel/package-list +++ /dev/null @@ -1,8 +0,0 @@ -# This file is used to build up the control file. The kernel version and -# "-di" are appended to the package names. Section can be left out. So can -# architecture, which is derived from the files in the modules directory. -# It overwrites specifications from /usr/share/kernel-wedge/package-list. -# -Package: kernel-image -Provides: rtc-modules -Provides_loongson-3: i2c-modules, rtc-modules diff --git a/debian/installer/mipsr6/kernel-versions b/debian/installer/mipsr6/kernel-versions deleted file mode 100644 index db5d2d2ca..000000000 --- a/debian/installer/mipsr6/kernel-versions +++ /dev/null @@ -1,2 +0,0 @@ -# arch version flavour installedname suffix build-depends -mipsr6 - mips32r6 - y - diff --git a/debian/installer/mipsr6/modules/mips32r6 b/debian/installer/mipsr6/modules/mips32r6 deleted file mode 120000 index d3bf739f6..000000000 --- a/debian/installer/mipsr6/modules/mips32r6 +++ /dev/null @@ -1 +0,0 @@ -../../mips/modules/mips \ No newline at end of file diff --git a/debian/installer/mipsr6/package-list b/debian/installer/mipsr6/package-list deleted file mode 100644 index b7141bb20..000000000 --- a/debian/installer/mipsr6/package-list +++ /dev/null @@ -1,7 +0,0 @@ -# This file is used to build up the control file. The kernel version and -# "-di" are appended to the package names. Section can be left out. So can -# architecture, which is derived from the files in the modules directory. -# It overwrites specifications from /usr/share/kernel-wedge/package-list. -# -Package: kernel-image -Provides: rtc-modules diff --git a/debian/installer/mipsr6el/kernel-versions b/debian/installer/mipsr6el/kernel-versions deleted file mode 100644 index 6e45c34ef..000000000 --- a/debian/installer/mipsr6el/kernel-versions +++ /dev/null @@ -1,2 +0,0 @@ -# arch version flavour installedname suffix build-depends -mipsr6el - mips32r6el - y - diff --git a/debian/installer/mipsr6el/modules/mips32r6el b/debian/installer/mipsr6el/modules/mips32r6el deleted file mode 120000 index d3bf739f6..000000000 --- a/debian/installer/mipsr6el/modules/mips32r6el +++ /dev/null @@ -1 +0,0 @@ -../../mips/modules/mips \ No newline at end of file diff --git a/debian/installer/mipsr6el/package-list b/debian/installer/mipsr6el/package-list deleted file mode 100644 index b7141bb20..000000000 --- a/debian/installer/mipsr6el/package-list +++ /dev/null @@ -1,7 +0,0 @@ -# This file is used to build up the control file. The kernel version and -# "-di" are appended to the package names. Section can be left out. So can -# architecture, which is derived from the files in the modules directory. -# It overwrites specifications from /usr/share/kernel-wedge/package-list. -# -Package: kernel-image -Provides: rtc-modules diff --git a/debian/installer/alpha/modules/alpha-generic/ata-modules b/debian/installer/modules/alpha-generic/ata-modules similarity index 100% rename from debian/installer/alpha/modules/alpha-generic/ata-modules rename to debian/installer/modules/alpha-generic/ata-modules diff --git a/debian/installer/alpha/modules/alpha-generic/btrfs-modules b/debian/installer/modules/alpha-generic/btrfs-modules similarity index 100% rename from debian/installer/alpha/modules/alpha-generic/btrfs-modules rename to debian/installer/modules/alpha-generic/btrfs-modules diff --git a/debian/installer/alpha/modules/alpha-generic/cdrom-core-modules b/debian/installer/modules/alpha-generic/cdrom-core-modules similarity index 100% rename from debian/installer/alpha/modules/alpha-generic/cdrom-core-modules rename to debian/installer/modules/alpha-generic/cdrom-core-modules diff --git a/debian/installer/alpha/modules/alpha-generic/compress-modules b/debian/installer/modules/alpha-generic/compress-modules similarity index 100% rename from debian/installer/alpha/modules/alpha-generic/compress-modules rename to debian/installer/modules/alpha-generic/compress-modules diff --git a/debian/installer/alpha/modules/alpha-generic/crc-modules b/debian/installer/modules/alpha-generic/crc-modules similarity index 100% rename from debian/installer/alpha/modules/alpha-generic/crc-modules rename to debian/installer/modules/alpha-generic/crc-modules diff --git a/debian/installer/alpha/modules/alpha-generic/crypto-dm-modules b/debian/installer/modules/alpha-generic/crypto-dm-modules similarity index 100% rename from debian/installer/alpha/modules/alpha-generic/crypto-dm-modules rename to debian/installer/modules/alpha-generic/crypto-dm-modules diff --git a/debian/installer/alpha/modules/alpha-generic/crypto-modules b/debian/installer/modules/alpha-generic/crypto-modules similarity index 100% rename from debian/installer/alpha/modules/alpha-generic/crypto-modules rename to debian/installer/modules/alpha-generic/crypto-modules diff --git a/debian/installer/alpha/modules/alpha-generic/event-modules b/debian/installer/modules/alpha-generic/event-modules similarity index 100% rename from debian/installer/alpha/modules/alpha-generic/event-modules rename to debian/installer/modules/alpha-generic/event-modules diff --git a/debian/installer/alpha/modules/alpha-generic/ext4-modules b/debian/installer/modules/alpha-generic/ext4-modules similarity index 100% rename from debian/installer/alpha/modules/alpha-generic/ext4-modules rename to debian/installer/modules/alpha-generic/ext4-modules diff --git a/debian/installer/alpha/modules/alpha-generic/fat-modules b/debian/installer/modules/alpha-generic/fat-modules similarity index 100% rename from debian/installer/alpha/modules/alpha-generic/fat-modules rename to debian/installer/modules/alpha-generic/fat-modules diff --git a/debian/installer/alpha/modules/alpha-generic/fuse-modules b/debian/installer/modules/alpha-generic/fuse-modules similarity index 100% rename from debian/installer/alpha/modules/alpha-generic/fuse-modules rename to debian/installer/modules/alpha-generic/fuse-modules diff --git a/debian/installer/alpha/modules/alpha-generic/i2c-modules b/debian/installer/modules/alpha-generic/i2c-modules similarity index 100% rename from debian/installer/alpha/modules/alpha-generic/i2c-modules rename to debian/installer/modules/alpha-generic/i2c-modules diff --git a/debian/installer/alpha/modules/alpha-generic/input-modules b/debian/installer/modules/alpha-generic/input-modules similarity index 100% rename from debian/installer/alpha/modules/alpha-generic/input-modules rename to debian/installer/modules/alpha-generic/input-modules diff --git a/debian/installer/alpha/modules/alpha-generic/isofs-modules b/debian/installer/modules/alpha-generic/isofs-modules similarity index 100% rename from debian/installer/alpha/modules/alpha-generic/isofs-modules rename to debian/installer/modules/alpha-generic/isofs-modules diff --git a/debian/installer/alpha/modules/alpha-generic/jfs-modules b/debian/installer/modules/alpha-generic/jfs-modules similarity index 100% rename from debian/installer/alpha/modules/alpha-generic/jfs-modules rename to debian/installer/modules/alpha-generic/jfs-modules diff --git a/debian/installer/alpha/modules/alpha-generic/kernel-image b/debian/installer/modules/alpha-generic/kernel-image similarity index 100% rename from debian/installer/alpha/modules/alpha-generic/kernel-image rename to debian/installer/modules/alpha-generic/kernel-image diff --git a/debian/installer/alpha/modules/alpha-generic/loop-modules b/debian/installer/modules/alpha-generic/loop-modules similarity index 100% rename from debian/installer/alpha/modules/alpha-generic/loop-modules rename to debian/installer/modules/alpha-generic/loop-modules diff --git a/debian/installer/alpha/modules/alpha-generic/md-modules b/debian/installer/modules/alpha-generic/md-modules similarity index 100% rename from debian/installer/alpha/modules/alpha-generic/md-modules rename to debian/installer/modules/alpha-generic/md-modules diff --git a/debian/installer/alpha/modules/alpha-generic/mouse-modules b/debian/installer/modules/alpha-generic/mouse-modules similarity index 100% rename from debian/installer/alpha/modules/alpha-generic/mouse-modules rename to debian/installer/modules/alpha-generic/mouse-modules diff --git a/debian/installer/alpha/modules/alpha-generic/multipath-modules b/debian/installer/modules/alpha-generic/multipath-modules similarity index 100% rename from debian/installer/alpha/modules/alpha-generic/multipath-modules rename to debian/installer/modules/alpha-generic/multipath-modules diff --git a/debian/installer/alpha/modules/alpha-generic/nbd-modules b/debian/installer/modules/alpha-generic/nbd-modules similarity index 100% rename from debian/installer/alpha/modules/alpha-generic/nbd-modules rename to debian/installer/modules/alpha-generic/nbd-modules diff --git a/debian/installer/alpha/modules/alpha-generic/nic-modules b/debian/installer/modules/alpha-generic/nic-modules similarity index 100% rename from debian/installer/alpha/modules/alpha-generic/nic-modules rename to debian/installer/modules/alpha-generic/nic-modules diff --git a/debian/installer/alpha/modules/alpha-generic/nic-pcmcia-modules b/debian/installer/modules/alpha-generic/nic-pcmcia-modules similarity index 100% rename from debian/installer/alpha/modules/alpha-generic/nic-pcmcia-modules rename to debian/installer/modules/alpha-generic/nic-pcmcia-modules diff --git a/debian/installer/alpha/modules/alpha-generic/nic-shared-modules b/debian/installer/modules/alpha-generic/nic-shared-modules similarity index 100% rename from debian/installer/alpha/modules/alpha-generic/nic-shared-modules rename to debian/installer/modules/alpha-generic/nic-shared-modules diff --git a/debian/installer/alpha/modules/alpha-generic/nic-usb-modules b/debian/installer/modules/alpha-generic/nic-usb-modules similarity index 100% rename from debian/installer/alpha/modules/alpha-generic/nic-usb-modules rename to debian/installer/modules/alpha-generic/nic-usb-modules diff --git a/debian/installer/alpha/modules/alpha-generic/nic-wireless-modules b/debian/installer/modules/alpha-generic/nic-wireless-modules similarity index 100% rename from debian/installer/alpha/modules/alpha-generic/nic-wireless-modules rename to debian/installer/modules/alpha-generic/nic-wireless-modules diff --git a/debian/installer/alpha/modules/alpha-generic/pata-modules b/debian/installer/modules/alpha-generic/pata-modules similarity index 100% rename from debian/installer/alpha/modules/alpha-generic/pata-modules rename to debian/installer/modules/alpha-generic/pata-modules diff --git a/debian/installer/alpha/modules/alpha-generic/pcmcia-modules b/debian/installer/modules/alpha-generic/pcmcia-modules similarity index 100% rename from debian/installer/alpha/modules/alpha-generic/pcmcia-modules rename to debian/installer/modules/alpha-generic/pcmcia-modules diff --git a/debian/installer/alpha/modules/alpha-generic/ppp-modules b/debian/installer/modules/alpha-generic/ppp-modules similarity index 100% rename from debian/installer/alpha/modules/alpha-generic/ppp-modules rename to debian/installer/modules/alpha-generic/ppp-modules diff --git a/debian/installer/alpha/modules/alpha-generic/sata-modules b/debian/installer/modules/alpha-generic/sata-modules similarity index 100% rename from debian/installer/alpha/modules/alpha-generic/sata-modules rename to debian/installer/modules/alpha-generic/sata-modules diff --git a/debian/installer/alpha/modules/alpha-generic/scsi-core-modules b/debian/installer/modules/alpha-generic/scsi-core-modules similarity index 100% rename from debian/installer/alpha/modules/alpha-generic/scsi-core-modules rename to debian/installer/modules/alpha-generic/scsi-core-modules diff --git a/debian/installer/alpha/modules/alpha-generic/scsi-modules b/debian/installer/modules/alpha-generic/scsi-modules similarity index 100% rename from debian/installer/alpha/modules/alpha-generic/scsi-modules rename to debian/installer/modules/alpha-generic/scsi-modules diff --git a/debian/installer/alpha/modules/alpha-generic/serial-modules b/debian/installer/modules/alpha-generic/serial-modules similarity index 100% rename from debian/installer/alpha/modules/alpha-generic/serial-modules rename to debian/installer/modules/alpha-generic/serial-modules diff --git a/debian/installer/alpha/modules/alpha-generic/squashfs-modules b/debian/installer/modules/alpha-generic/squashfs-modules similarity index 100% rename from debian/installer/alpha/modules/alpha-generic/squashfs-modules rename to debian/installer/modules/alpha-generic/squashfs-modules diff --git a/debian/installer/alpha/modules/alpha-generic/srm-modules b/debian/installer/modules/alpha-generic/srm-modules similarity index 100% rename from debian/installer/alpha/modules/alpha-generic/srm-modules rename to debian/installer/modules/alpha-generic/srm-modules diff --git a/debian/installer/alpha/modules/alpha-generic/usb-modules b/debian/installer/modules/alpha-generic/usb-modules similarity index 100% rename from debian/installer/alpha/modules/alpha-generic/usb-modules rename to debian/installer/modules/alpha-generic/usb-modules diff --git a/debian/installer/alpha/modules/alpha-generic/usb-serial-modules b/debian/installer/modules/alpha-generic/usb-serial-modules similarity index 100% rename from debian/installer/alpha/modules/alpha-generic/usb-serial-modules rename to debian/installer/modules/alpha-generic/usb-serial-modules diff --git a/debian/installer/alpha/modules/alpha-generic/usb-storage-modules b/debian/installer/modules/alpha-generic/usb-storage-modules similarity index 100% rename from debian/installer/alpha/modules/alpha-generic/usb-storage-modules rename to debian/installer/modules/alpha-generic/usb-storage-modules diff --git a/debian/installer/alpha/modules/alpha-generic/virtio-modules b/debian/installer/modules/alpha-generic/virtio-modules similarity index 100% rename from debian/installer/alpha/modules/alpha-generic/virtio-modules rename to debian/installer/modules/alpha-generic/virtio-modules diff --git a/debian/installer/alpha/modules/alpha-generic/xfs-modules b/debian/installer/modules/alpha-generic/xfs-modules similarity index 100% rename from debian/installer/alpha/modules/alpha-generic/xfs-modules rename to debian/installer/modules/alpha-generic/xfs-modules diff --git a/debian/installer/alpha/modules/alpha-generic/zlib-modules b/debian/installer/modules/alpha-generic/zlib-modules similarity index 100% rename from debian/installer/alpha/modules/alpha-generic/zlib-modules rename to debian/installer/modules/alpha-generic/zlib-modules diff --git a/debian/installer/amd64/modules/amd64/acpi-modules b/debian/installer/modules/amd64/acpi-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/acpi-modules rename to debian/installer/modules/amd64/acpi-modules diff --git a/debian/installer/amd64/modules/amd64/ata-modules b/debian/installer/modules/amd64/ata-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/ata-modules rename to debian/installer/modules/amd64/ata-modules diff --git a/debian/installer/amd64/modules/amd64/btrfs-modules b/debian/installer/modules/amd64/btrfs-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/btrfs-modules rename to debian/installer/modules/amd64/btrfs-modules diff --git a/debian/installer/amd64/modules/amd64/cdrom-core-modules b/debian/installer/modules/amd64/cdrom-core-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/cdrom-core-modules rename to debian/installer/modules/amd64/cdrom-core-modules diff --git a/debian/installer/amd64/modules/amd64/compress-modules b/debian/installer/modules/amd64/compress-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/compress-modules rename to debian/installer/modules/amd64/compress-modules diff --git a/debian/installer/amd64/modules/amd64/crc-modules b/debian/installer/modules/amd64/crc-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/crc-modules rename to debian/installer/modules/amd64/crc-modules diff --git a/debian/installer/amd64/modules/amd64/crypto-dm-modules b/debian/installer/modules/amd64/crypto-dm-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/crypto-dm-modules rename to debian/installer/modules/amd64/crypto-dm-modules diff --git a/debian/installer/amd64/modules/amd64/crypto-modules b/debian/installer/modules/amd64/crypto-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/crypto-modules rename to debian/installer/modules/amd64/crypto-modules diff --git a/debian/installer/amd64/modules/amd64/efi-modules b/debian/installer/modules/amd64/efi-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/efi-modules rename to debian/installer/modules/amd64/efi-modules diff --git a/debian/installer/amd64/modules/amd64/event-modules b/debian/installer/modules/amd64/event-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/event-modules rename to debian/installer/modules/amd64/event-modules diff --git a/debian/installer/amd64/modules/amd64/ext4-modules b/debian/installer/modules/amd64/ext4-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/ext4-modules rename to debian/installer/modules/amd64/ext4-modules diff --git a/debian/installer/amd64/modules/amd64/fat-modules b/debian/installer/modules/amd64/fat-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/fat-modules rename to debian/installer/modules/amd64/fat-modules diff --git a/debian/installer/amd64/modules/amd64/fb-modules b/debian/installer/modules/amd64/fb-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/fb-modules rename to debian/installer/modules/amd64/fb-modules diff --git a/debian/installer/amd64/modules/amd64/firewire-core-modules b/debian/installer/modules/amd64/firewire-core-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/firewire-core-modules rename to debian/installer/modules/amd64/firewire-core-modules diff --git a/debian/installer/amd64/modules/amd64/fuse-modules b/debian/installer/modules/amd64/fuse-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/fuse-modules rename to debian/installer/modules/amd64/fuse-modules diff --git a/debian/installer/amd64/modules/amd64/hyperv-modules b/debian/installer/modules/amd64/hyperv-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/hyperv-modules rename to debian/installer/modules/amd64/hyperv-modules diff --git a/debian/installer/amd64/modules/amd64/i2c-modules b/debian/installer/modules/amd64/i2c-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/i2c-modules rename to debian/installer/modules/amd64/i2c-modules diff --git a/debian/installer/amd64/modules/amd64/input-modules b/debian/installer/modules/amd64/input-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/input-modules rename to debian/installer/modules/amd64/input-modules diff --git a/debian/installer/amd64/modules/amd64/isofs-modules b/debian/installer/modules/amd64/isofs-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/isofs-modules rename to debian/installer/modules/amd64/isofs-modules diff --git a/debian/installer/amd64/modules/amd64/jfs-modules b/debian/installer/modules/amd64/jfs-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/jfs-modules rename to debian/installer/modules/amd64/jfs-modules diff --git a/debian/installer/amd64/modules/amd64/kernel-image b/debian/installer/modules/amd64/kernel-image similarity index 100% rename from debian/installer/amd64/modules/amd64/kernel-image rename to debian/installer/modules/amd64/kernel-image diff --git a/debian/installer/amd64/modules/amd64/loop-modules b/debian/installer/modules/amd64/loop-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/loop-modules rename to debian/installer/modules/amd64/loop-modules diff --git a/debian/installer/amd64/modules/amd64/md-modules b/debian/installer/modules/amd64/md-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/md-modules rename to debian/installer/modules/amd64/md-modules diff --git a/debian/installer/amd64/modules/amd64/mmc-core-modules b/debian/installer/modules/amd64/mmc-core-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/mmc-core-modules rename to debian/installer/modules/amd64/mmc-core-modules diff --git a/debian/installer/amd64/modules/amd64/mmc-modules b/debian/installer/modules/amd64/mmc-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/mmc-modules rename to debian/installer/modules/amd64/mmc-modules diff --git a/debian/installer/amd64/modules/amd64/mouse-modules b/debian/installer/modules/amd64/mouse-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/mouse-modules rename to debian/installer/modules/amd64/mouse-modules diff --git a/debian/installer/amd64/modules/amd64/multipath-modules b/debian/installer/modules/amd64/multipath-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/multipath-modules rename to debian/installer/modules/amd64/multipath-modules diff --git a/debian/installer/amd64/modules/amd64/nbd-modules b/debian/installer/modules/amd64/nbd-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/nbd-modules rename to debian/installer/modules/amd64/nbd-modules diff --git a/debian/installer/amd64/modules/amd64/nic-modules b/debian/installer/modules/amd64/nic-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/nic-modules rename to debian/installer/modules/amd64/nic-modules diff --git a/debian/installer/amd64/modules/amd64/nic-pcmcia-modules b/debian/installer/modules/amd64/nic-pcmcia-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/nic-pcmcia-modules rename to debian/installer/modules/amd64/nic-pcmcia-modules diff --git a/debian/installer/amd64/modules/amd64/nic-shared-modules b/debian/installer/modules/amd64/nic-shared-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/nic-shared-modules rename to debian/installer/modules/amd64/nic-shared-modules diff --git a/debian/installer/amd64/modules/amd64/nic-usb-modules b/debian/installer/modules/amd64/nic-usb-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/nic-usb-modules rename to debian/installer/modules/amd64/nic-usb-modules diff --git a/debian/installer/amd64/modules/amd64/nic-wireless-modules b/debian/installer/modules/amd64/nic-wireless-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/nic-wireless-modules rename to debian/installer/modules/amd64/nic-wireless-modules diff --git a/debian/installer/amd64/modules/amd64/ntfs-modules b/debian/installer/modules/amd64/ntfs-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/ntfs-modules rename to debian/installer/modules/amd64/ntfs-modules diff --git a/debian/installer/amd64/modules/amd64/pata-modules b/debian/installer/modules/amd64/pata-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/pata-modules rename to debian/installer/modules/amd64/pata-modules diff --git a/debian/installer/amd64/modules/amd64/pcmcia-modules b/debian/installer/modules/amd64/pcmcia-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/pcmcia-modules rename to debian/installer/modules/amd64/pcmcia-modules diff --git a/debian/installer/amd64/modules/amd64/pcmcia-storage-modules b/debian/installer/modules/amd64/pcmcia-storage-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/pcmcia-storage-modules rename to debian/installer/modules/amd64/pcmcia-storage-modules diff --git a/debian/installer/amd64/modules/amd64/ppp-modules b/debian/installer/modules/amd64/ppp-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/ppp-modules rename to debian/installer/modules/amd64/ppp-modules diff --git a/debian/installer/amd64/modules/amd64/sata-modules b/debian/installer/modules/amd64/sata-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/sata-modules rename to debian/installer/modules/amd64/sata-modules diff --git a/debian/installer/amd64/modules/amd64/scsi-core-modules b/debian/installer/modules/amd64/scsi-core-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/scsi-core-modules rename to debian/installer/modules/amd64/scsi-core-modules diff --git a/debian/installer/amd64/modules/amd64/scsi-modules b/debian/installer/modules/amd64/scsi-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/scsi-modules rename to debian/installer/modules/amd64/scsi-modules diff --git a/debian/installer/amd64/modules/amd64/serial-modules b/debian/installer/modules/amd64/serial-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/serial-modules rename to debian/installer/modules/amd64/serial-modules diff --git a/debian/installer/amd64/modules/amd64/sound-modules b/debian/installer/modules/amd64/sound-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/sound-modules rename to debian/installer/modules/amd64/sound-modules diff --git a/debian/installer/amd64/modules/amd64/speakup-modules b/debian/installer/modules/amd64/speakup-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/speakup-modules rename to debian/installer/modules/amd64/speakup-modules diff --git a/debian/installer/amd64/modules/amd64/squashfs-modules b/debian/installer/modules/amd64/squashfs-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/squashfs-modules rename to debian/installer/modules/amd64/squashfs-modules diff --git a/debian/installer/amd64/modules/amd64/udf-modules b/debian/installer/modules/amd64/udf-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/udf-modules rename to debian/installer/modules/amd64/udf-modules diff --git a/debian/installer/amd64/modules/amd64/uinput-modules b/debian/installer/modules/amd64/uinput-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/uinput-modules rename to debian/installer/modules/amd64/uinput-modules diff --git a/debian/installer/amd64/modules/amd64/usb-modules b/debian/installer/modules/amd64/usb-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/usb-modules rename to debian/installer/modules/amd64/usb-modules diff --git a/debian/installer/amd64/modules/amd64/usb-serial-modules b/debian/installer/modules/amd64/usb-serial-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/usb-serial-modules rename to debian/installer/modules/amd64/usb-serial-modules diff --git a/debian/installer/amd64/modules/amd64/usb-storage-modules b/debian/installer/modules/amd64/usb-storage-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/usb-storage-modules rename to debian/installer/modules/amd64/usb-storage-modules diff --git a/debian/installer/amd64/modules/amd64/virtio-modules b/debian/installer/modules/amd64/virtio-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/virtio-modules rename to debian/installer/modules/amd64/virtio-modules diff --git a/debian/installer/amd64/modules/amd64/xfs-modules b/debian/installer/modules/amd64/xfs-modules similarity index 100% rename from debian/installer/amd64/modules/amd64/xfs-modules rename to debian/installer/modules/amd64/xfs-modules diff --git a/debian/installer/arm64/modules/arm64/ata-modules b/debian/installer/modules/arm64/ata-modules similarity index 100% rename from debian/installer/arm64/modules/arm64/ata-modules rename to debian/installer/modules/arm64/ata-modules diff --git a/debian/installer/arm64/modules/arm64/btrfs-modules b/debian/installer/modules/arm64/btrfs-modules similarity index 100% rename from debian/installer/arm64/modules/arm64/btrfs-modules rename to debian/installer/modules/arm64/btrfs-modules diff --git a/debian/installer/arm64/modules/arm64/cdrom-core-modules b/debian/installer/modules/arm64/cdrom-core-modules similarity index 100% rename from debian/installer/arm64/modules/arm64/cdrom-core-modules rename to debian/installer/modules/arm64/cdrom-core-modules diff --git a/debian/installer/arm64/modules/arm64/compress-modules b/debian/installer/modules/arm64/compress-modules similarity index 100% rename from debian/installer/arm64/modules/arm64/compress-modules rename to debian/installer/modules/arm64/compress-modules diff --git a/debian/installer/arm64/modules/arm64/crc-modules b/debian/installer/modules/arm64/crc-modules similarity index 100% rename from debian/installer/arm64/modules/arm64/crc-modules rename to debian/installer/modules/arm64/crc-modules diff --git a/debian/installer/arm64/modules/arm64/crypto-dm-modules b/debian/installer/modules/arm64/crypto-dm-modules similarity index 100% rename from debian/installer/arm64/modules/arm64/crypto-dm-modules rename to debian/installer/modules/arm64/crypto-dm-modules diff --git a/debian/installer/arm64/modules/arm64/crypto-modules b/debian/installer/modules/arm64/crypto-modules similarity index 100% rename from debian/installer/arm64/modules/arm64/crypto-modules rename to debian/installer/modules/arm64/crypto-modules diff --git a/debian/installer/arm64/modules/arm64/efi-modules b/debian/installer/modules/arm64/efi-modules similarity index 100% rename from debian/installer/arm64/modules/arm64/efi-modules rename to debian/installer/modules/arm64/efi-modules diff --git a/debian/installer/arm64/modules/arm64/event-modules b/debian/installer/modules/arm64/event-modules similarity index 100% rename from debian/installer/arm64/modules/arm64/event-modules rename to debian/installer/modules/arm64/event-modules diff --git a/debian/installer/arm64/modules/arm64/ext4-modules b/debian/installer/modules/arm64/ext4-modules similarity index 100% rename from debian/installer/arm64/modules/arm64/ext4-modules rename to debian/installer/modules/arm64/ext4-modules diff --git a/debian/installer/arm64/modules/arm64/fat-modules b/debian/installer/modules/arm64/fat-modules similarity index 100% rename from debian/installer/arm64/modules/arm64/fat-modules rename to debian/installer/modules/arm64/fat-modules diff --git a/debian/installer/arm64/modules/arm64/fb-modules b/debian/installer/modules/arm64/fb-modules similarity index 100% rename from debian/installer/arm64/modules/arm64/fb-modules rename to debian/installer/modules/arm64/fb-modules diff --git a/debian/installer/arm64/modules/arm64/fuse-modules b/debian/installer/modules/arm64/fuse-modules similarity index 100% rename from debian/installer/arm64/modules/arm64/fuse-modules rename to debian/installer/modules/arm64/fuse-modules diff --git a/debian/installer/arm64/modules/arm64/i2c-modules b/debian/installer/modules/arm64/i2c-modules similarity index 100% rename from debian/installer/arm64/modules/arm64/i2c-modules rename to debian/installer/modules/arm64/i2c-modules diff --git a/debian/installer/arm64/modules/arm64/input-modules b/debian/installer/modules/arm64/input-modules similarity index 100% rename from debian/installer/arm64/modules/arm64/input-modules rename to debian/installer/modules/arm64/input-modules diff --git a/debian/installer/arm64/modules/arm64/isofs-modules b/debian/installer/modules/arm64/isofs-modules similarity index 100% rename from debian/installer/arm64/modules/arm64/isofs-modules rename to debian/installer/modules/arm64/isofs-modules diff --git a/debian/installer/arm64/modules/arm64/jfs-modules b/debian/installer/modules/arm64/jfs-modules similarity index 100% rename from debian/installer/arm64/modules/arm64/jfs-modules rename to debian/installer/modules/arm64/jfs-modules diff --git a/debian/installer/arm64/modules/arm64/kernel-image b/debian/installer/modules/arm64/kernel-image similarity index 100% rename from debian/installer/arm64/modules/arm64/kernel-image rename to debian/installer/modules/arm64/kernel-image diff --git a/debian/installer/arm64/modules/arm64/leds-modules b/debian/installer/modules/arm64/leds-modules similarity index 100% rename from debian/installer/arm64/modules/arm64/leds-modules rename to debian/installer/modules/arm64/leds-modules diff --git a/debian/installer/arm64/modules/arm64/loop-modules b/debian/installer/modules/arm64/loop-modules similarity index 100% rename from debian/installer/arm64/modules/arm64/loop-modules rename to debian/installer/modules/arm64/loop-modules diff --git a/debian/installer/arm64/modules/arm64/md-modules b/debian/installer/modules/arm64/md-modules similarity index 100% rename from debian/installer/arm64/modules/arm64/md-modules rename to debian/installer/modules/arm64/md-modules diff --git a/debian/installer/arm64/modules/arm64/mmc-modules b/debian/installer/modules/arm64/mmc-modules similarity index 100% rename from debian/installer/arm64/modules/arm64/mmc-modules rename to debian/installer/modules/arm64/mmc-modules diff --git a/debian/installer/arm64/modules/arm64/multipath-modules b/debian/installer/modules/arm64/multipath-modules similarity index 100% rename from debian/installer/arm64/modules/arm64/multipath-modules rename to debian/installer/modules/arm64/multipath-modules diff --git a/debian/installer/arm64/modules/arm64/nbd-modules b/debian/installer/modules/arm64/nbd-modules similarity index 100% rename from debian/installer/arm64/modules/arm64/nbd-modules rename to debian/installer/modules/arm64/nbd-modules diff --git a/debian/installer/arm64/modules/arm64/nic-modules b/debian/installer/modules/arm64/nic-modules similarity index 100% rename from debian/installer/arm64/modules/arm64/nic-modules rename to debian/installer/modules/arm64/nic-modules diff --git a/debian/installer/arm64/modules/arm64/nic-shared-modules b/debian/installer/modules/arm64/nic-shared-modules similarity index 100% rename from debian/installer/arm64/modules/arm64/nic-shared-modules rename to debian/installer/modules/arm64/nic-shared-modules diff --git a/debian/installer/arm64/modules/arm64/nic-usb-modules b/debian/installer/modules/arm64/nic-usb-modules similarity index 100% rename from debian/installer/arm64/modules/arm64/nic-usb-modules rename to debian/installer/modules/arm64/nic-usb-modules diff --git a/debian/installer/arm64/modules/arm64/nic-wireless-modules b/debian/installer/modules/arm64/nic-wireless-modules similarity index 100% rename from debian/installer/arm64/modules/arm64/nic-wireless-modules rename to debian/installer/modules/arm64/nic-wireless-modules diff --git a/debian/installer/arm64/modules/arm64/ppp-modules b/debian/installer/modules/arm64/ppp-modules similarity index 100% rename from debian/installer/arm64/modules/arm64/ppp-modules rename to debian/installer/modules/arm64/ppp-modules diff --git a/debian/installer/arm64/modules/arm64/sata-modules b/debian/installer/modules/arm64/sata-modules similarity index 100% rename from debian/installer/arm64/modules/arm64/sata-modules rename to debian/installer/modules/arm64/sata-modules diff --git a/debian/installer/arm64/modules/arm64/scsi-core-modules b/debian/installer/modules/arm64/scsi-core-modules similarity index 100% rename from debian/installer/arm64/modules/arm64/scsi-core-modules rename to debian/installer/modules/arm64/scsi-core-modules diff --git a/debian/installer/arm64/modules/arm64/scsi-modules b/debian/installer/modules/arm64/scsi-modules similarity index 100% rename from debian/installer/arm64/modules/arm64/scsi-modules rename to debian/installer/modules/arm64/scsi-modules diff --git a/debian/installer/arm64/modules/arm64/squashfs-modules b/debian/installer/modules/arm64/squashfs-modules similarity index 100% rename from debian/installer/arm64/modules/arm64/squashfs-modules rename to debian/installer/modules/arm64/squashfs-modules diff --git a/debian/installer/arm64/modules/arm64/udf-modules b/debian/installer/modules/arm64/udf-modules similarity index 100% rename from debian/installer/arm64/modules/arm64/udf-modules rename to debian/installer/modules/arm64/udf-modules diff --git a/debian/installer/arm64/modules/arm64/uinput-modules b/debian/installer/modules/arm64/uinput-modules similarity index 100% rename from debian/installer/arm64/modules/arm64/uinput-modules rename to debian/installer/modules/arm64/uinput-modules diff --git a/debian/installer/arm64/modules/arm64/usb-modules b/debian/installer/modules/arm64/usb-modules similarity index 100% rename from debian/installer/arm64/modules/arm64/usb-modules rename to debian/installer/modules/arm64/usb-modules diff --git a/debian/installer/arm64/modules/arm64/usb-storage-modules b/debian/installer/modules/arm64/usb-storage-modules similarity index 100% rename from debian/installer/arm64/modules/arm64/usb-storage-modules rename to debian/installer/modules/arm64/usb-storage-modules diff --git a/debian/installer/arm64/modules/arm64/virtio-modules b/debian/installer/modules/arm64/virtio-modules similarity index 100% rename from debian/installer/arm64/modules/arm64/virtio-modules rename to debian/installer/modules/arm64/virtio-modules diff --git a/debian/installer/arm64/modules/arm64/xfs-modules b/debian/installer/modules/arm64/xfs-modules similarity index 100% rename from debian/installer/arm64/modules/arm64/xfs-modules rename to debian/installer/modules/arm64/xfs-modules diff --git a/debian/installer/armel/modules/armel-marvell/btrfs-modules b/debian/installer/modules/armel-marvell/btrfs-modules similarity index 100% rename from debian/installer/armel/modules/armel-marvell/btrfs-modules rename to debian/installer/modules/armel-marvell/btrfs-modules diff --git a/debian/installer/armel/modules/armel-marvell/cdrom-core-modules b/debian/installer/modules/armel-marvell/cdrom-core-modules similarity index 100% rename from debian/installer/armel/modules/armel-marvell/cdrom-core-modules rename to debian/installer/modules/armel-marvell/cdrom-core-modules diff --git a/debian/installer/armel/modules/armel-marvell/compress-modules b/debian/installer/modules/armel-marvell/compress-modules similarity index 100% rename from debian/installer/armel/modules/armel-marvell/compress-modules rename to debian/installer/modules/armel-marvell/compress-modules diff --git a/debian/installer/armel/modules/armel-marvell/crc-modules b/debian/installer/modules/armel-marvell/crc-modules similarity index 100% rename from debian/installer/armel/modules/armel-marvell/crc-modules rename to debian/installer/modules/armel-marvell/crc-modules diff --git a/debian/installer/armel/modules/armel-marvell/crypto-dm-modules b/debian/installer/modules/armel-marvell/crypto-dm-modules similarity index 100% rename from debian/installer/armel/modules/armel-marvell/crypto-dm-modules rename to debian/installer/modules/armel-marvell/crypto-dm-modules diff --git a/debian/installer/armel/modules/armel-marvell/crypto-modules b/debian/installer/modules/armel-marvell/crypto-modules similarity index 100% rename from debian/installer/armel/modules/armel-marvell/crypto-modules rename to debian/installer/modules/armel-marvell/crypto-modules diff --git a/debian/installer/armel/modules/armel-marvell/event-modules b/debian/installer/modules/armel-marvell/event-modules similarity index 100% rename from debian/installer/armel/modules/armel-marvell/event-modules rename to debian/installer/modules/armel-marvell/event-modules diff --git a/debian/installer/armel/modules/armel-marvell/ext4-modules b/debian/installer/modules/armel-marvell/ext4-modules similarity index 100% rename from debian/installer/armel/modules/armel-marvell/ext4-modules rename to debian/installer/modules/armel-marvell/ext4-modules diff --git a/debian/installer/armel/modules/armel-marvell/fat-modules b/debian/installer/modules/armel-marvell/fat-modules similarity index 100% rename from debian/installer/armel/modules/armel-marvell/fat-modules rename to debian/installer/modules/armel-marvell/fat-modules diff --git a/debian/installer/armel/modules/armel-marvell/fb-modules b/debian/installer/modules/armel-marvell/fb-modules similarity index 100% rename from debian/installer/armel/modules/armel-marvell/fb-modules rename to debian/installer/modules/armel-marvell/fb-modules diff --git a/debian/installer/armel/modules/armel-marvell/fuse-modules b/debian/installer/modules/armel-marvell/fuse-modules similarity index 100% rename from debian/installer/armel/modules/armel-marvell/fuse-modules rename to debian/installer/modules/armel-marvell/fuse-modules diff --git a/debian/installer/armel/modules/armel-marvell/input-modules b/debian/installer/modules/armel-marvell/input-modules similarity index 100% rename from debian/installer/armel/modules/armel-marvell/input-modules rename to debian/installer/modules/armel-marvell/input-modules diff --git a/debian/installer/armel/modules/armel-marvell/ipv6-modules b/debian/installer/modules/armel-marvell/ipv6-modules similarity index 100% rename from debian/installer/armel/modules/armel-marvell/ipv6-modules rename to debian/installer/modules/armel-marvell/ipv6-modules diff --git a/debian/installer/armel/modules/armel-marvell/isofs-modules b/debian/installer/modules/armel-marvell/isofs-modules similarity index 100% rename from debian/installer/armel/modules/armel-marvell/isofs-modules rename to debian/installer/modules/armel-marvell/isofs-modules diff --git a/debian/installer/armel/modules/armel-marvell/jffs2-modules b/debian/installer/modules/armel-marvell/jffs2-modules similarity index 100% rename from debian/installer/armel/modules/armel-marvell/jffs2-modules rename to debian/installer/modules/armel-marvell/jffs2-modules diff --git a/debian/installer/armel/modules/armel-marvell/jfs-modules b/debian/installer/modules/armel-marvell/jfs-modules similarity index 100% rename from debian/installer/armel/modules/armel-marvell/jfs-modules rename to debian/installer/modules/armel-marvell/jfs-modules diff --git a/debian/installer/armel/modules/armel-marvell/kernel-image b/debian/installer/modules/armel-marvell/kernel-image similarity index 100% rename from debian/installer/armel/modules/armel-marvell/kernel-image rename to debian/installer/modules/armel-marvell/kernel-image diff --git a/debian/installer/armel/modules/armel-marvell/leds-modules b/debian/installer/modules/armel-marvell/leds-modules similarity index 100% rename from debian/installer/armel/modules/armel-marvell/leds-modules rename to debian/installer/modules/armel-marvell/leds-modules diff --git a/debian/installer/armel/modules/armel-marvell/loop-modules b/debian/installer/modules/armel-marvell/loop-modules similarity index 100% rename from debian/installer/armel/modules/armel-marvell/loop-modules rename to debian/installer/modules/armel-marvell/loop-modules diff --git a/debian/installer/armel/modules/armel-marvell/md-modules b/debian/installer/modules/armel-marvell/md-modules similarity index 100% rename from debian/installer/armel/modules/armel-marvell/md-modules rename to debian/installer/modules/armel-marvell/md-modules diff --git a/debian/installer/armel/modules/armel-marvell/minix-modules b/debian/installer/modules/armel-marvell/minix-modules similarity index 100% rename from debian/installer/armel/modules/armel-marvell/minix-modules rename to debian/installer/modules/armel-marvell/minix-modules diff --git a/debian/installer/armel/modules/armel-marvell/mmc-modules b/debian/installer/modules/armel-marvell/mmc-modules similarity index 100% rename from debian/installer/armel/modules/armel-marvell/mmc-modules rename to debian/installer/modules/armel-marvell/mmc-modules diff --git a/debian/installer/armel/modules/armel-marvell/mouse-modules b/debian/installer/modules/armel-marvell/mouse-modules similarity index 100% rename from debian/installer/armel/modules/armel-marvell/mouse-modules rename to debian/installer/modules/armel-marvell/mouse-modules diff --git a/debian/installer/armel/modules/armel-marvell/mtd-modules b/debian/installer/modules/armel-marvell/mtd-modules similarity index 100% rename from debian/installer/armel/modules/armel-marvell/mtd-modules rename to debian/installer/modules/armel-marvell/mtd-modules diff --git a/debian/installer/armel/modules/armel-marvell/multipath-modules b/debian/installer/modules/armel-marvell/multipath-modules similarity index 100% rename from debian/installer/armel/modules/armel-marvell/multipath-modules rename to debian/installer/modules/armel-marvell/multipath-modules diff --git a/debian/installer/armel/modules/armel-marvell/nbd-modules b/debian/installer/modules/armel-marvell/nbd-modules similarity index 100% rename from debian/installer/armel/modules/armel-marvell/nbd-modules rename to debian/installer/modules/armel-marvell/nbd-modules diff --git a/debian/installer/armel/modules/armel-marvell/nic-modules b/debian/installer/modules/armel-marvell/nic-modules similarity index 100% rename from debian/installer/armel/modules/armel-marvell/nic-modules rename to debian/installer/modules/armel-marvell/nic-modules diff --git a/debian/installer/armel/modules/armel-marvell/nic-shared-modules b/debian/installer/modules/armel-marvell/nic-shared-modules similarity index 100% rename from debian/installer/armel/modules/armel-marvell/nic-shared-modules rename to debian/installer/modules/armel-marvell/nic-shared-modules diff --git a/debian/installer/armel/modules/armel-marvell/nic-usb-modules b/debian/installer/modules/armel-marvell/nic-usb-modules similarity index 100% rename from debian/installer/armel/modules/armel-marvell/nic-usb-modules rename to debian/installer/modules/armel-marvell/nic-usb-modules diff --git a/debian/installer/armel/modules/armel-marvell/ppp-modules b/debian/installer/modules/armel-marvell/ppp-modules similarity index 100% rename from debian/installer/armel/modules/armel-marvell/ppp-modules rename to debian/installer/modules/armel-marvell/ppp-modules diff --git a/debian/installer/armel/modules/armel-marvell/sata-modules b/debian/installer/modules/armel-marvell/sata-modules similarity index 100% rename from debian/installer/armel/modules/armel-marvell/sata-modules rename to debian/installer/modules/armel-marvell/sata-modules diff --git a/debian/installer/armel/modules/armel-marvell/scsi-core-modules b/debian/installer/modules/armel-marvell/scsi-core-modules similarity index 100% rename from debian/installer/armel/modules/armel-marvell/scsi-core-modules rename to debian/installer/modules/armel-marvell/scsi-core-modules diff --git a/debian/installer/armel/modules/armel-marvell/squashfs-modules b/debian/installer/modules/armel-marvell/squashfs-modules similarity index 100% rename from debian/installer/armel/modules/armel-marvell/squashfs-modules rename to debian/installer/modules/armel-marvell/squashfs-modules diff --git a/debian/installer/armel/modules/armel-marvell/udf-modules b/debian/installer/modules/armel-marvell/udf-modules similarity index 100% rename from debian/installer/armel/modules/armel-marvell/udf-modules rename to debian/installer/modules/armel-marvell/udf-modules diff --git a/debian/installer/armel/modules/armel-marvell/uinput-modules b/debian/installer/modules/armel-marvell/uinput-modules similarity index 100% rename from debian/installer/armel/modules/armel-marvell/uinput-modules rename to debian/installer/modules/armel-marvell/uinput-modules diff --git a/debian/installer/armel/modules/armel-marvell/usb-modules b/debian/installer/modules/armel-marvell/usb-modules similarity index 100% rename from debian/installer/armel/modules/armel-marvell/usb-modules rename to debian/installer/modules/armel-marvell/usb-modules diff --git a/debian/installer/armel/modules/armel-marvell/usb-serial-modules b/debian/installer/modules/armel-marvell/usb-serial-modules similarity index 100% rename from debian/installer/armel/modules/armel-marvell/usb-serial-modules rename to debian/installer/modules/armel-marvell/usb-serial-modules diff --git a/debian/installer/armel/modules/armel-marvell/usb-storage-modules b/debian/installer/modules/armel-marvell/usb-storage-modules similarity index 100% rename from debian/installer/armel/modules/armel-marvell/usb-storage-modules rename to debian/installer/modules/armel-marvell/usb-storage-modules diff --git a/debian/installer/armel/modules/armel-marvell/zlib-modules b/debian/installer/modules/armel-marvell/zlib-modules similarity index 100% rename from debian/installer/armel/modules/armel-marvell/zlib-modules rename to debian/installer/modules/armel-marvell/zlib-modules diff --git a/debian/installer/armhf/modules/armhf-armmp/ata-modules b/debian/installer/modules/armhf-armmp/ata-modules similarity index 100% rename from debian/installer/armhf/modules/armhf-armmp/ata-modules rename to debian/installer/modules/armhf-armmp/ata-modules diff --git a/debian/installer/armhf/modules/armhf-armmp/btrfs-modules b/debian/installer/modules/armhf-armmp/btrfs-modules similarity index 100% rename from debian/installer/armhf/modules/armhf-armmp/btrfs-modules rename to debian/installer/modules/armhf-armmp/btrfs-modules diff --git a/debian/installer/armhf/modules/armhf-armmp/compress-modules b/debian/installer/modules/armhf-armmp/compress-modules similarity index 100% rename from debian/installer/armhf/modules/armhf-armmp/compress-modules rename to debian/installer/modules/armhf-armmp/compress-modules diff --git a/debian/installer/armhf/modules/armhf-armmp/crc-modules b/debian/installer/modules/armhf-armmp/crc-modules similarity index 100% rename from debian/installer/armhf/modules/armhf-armmp/crc-modules rename to debian/installer/modules/armhf-armmp/crc-modules diff --git a/debian/installer/armhf/modules/armhf-armmp/crypto-dm-modules b/debian/installer/modules/armhf-armmp/crypto-dm-modules similarity index 100% rename from debian/installer/armhf/modules/armhf-armmp/crypto-dm-modules rename to debian/installer/modules/armhf-armmp/crypto-dm-modules diff --git a/debian/installer/armhf/modules/armhf-armmp/crypto-modules b/debian/installer/modules/armhf-armmp/crypto-modules similarity index 100% rename from debian/installer/armhf/modules/armhf-armmp/crypto-modules rename to debian/installer/modules/armhf-armmp/crypto-modules diff --git a/debian/installer/armhf/modules/armhf-armmp/efi-modules b/debian/installer/modules/armhf-armmp/efi-modules similarity index 100% rename from debian/installer/armhf/modules/armhf-armmp/efi-modules rename to debian/installer/modules/armhf-armmp/efi-modules diff --git a/debian/installer/armhf/modules/armhf-armmp/event-modules b/debian/installer/modules/armhf-armmp/event-modules similarity index 100% rename from debian/installer/armhf/modules/armhf-armmp/event-modules rename to debian/installer/modules/armhf-armmp/event-modules diff --git a/debian/installer/armhf/modules/armhf-armmp/ext4-modules b/debian/installer/modules/armhf-armmp/ext4-modules similarity index 100% rename from debian/installer/armhf/modules/armhf-armmp/ext4-modules rename to debian/installer/modules/armhf-armmp/ext4-modules diff --git a/debian/installer/armhf/modules/armhf-armmp/fat-modules b/debian/installer/modules/armhf-armmp/fat-modules similarity index 100% rename from debian/installer/armhf/modules/armhf-armmp/fat-modules rename to debian/installer/modules/armhf-armmp/fat-modules diff --git a/debian/installer/armhf/modules/armhf-armmp/fb-modules b/debian/installer/modules/armhf-armmp/fb-modules similarity index 100% rename from debian/installer/armhf/modules/armhf-armmp/fb-modules rename to debian/installer/modules/armhf-armmp/fb-modules diff --git a/debian/installer/armhf/modules/armhf-armmp/fuse-modules b/debian/installer/modules/armhf-armmp/fuse-modules similarity index 100% rename from debian/installer/armhf/modules/armhf-armmp/fuse-modules rename to debian/installer/modules/armhf-armmp/fuse-modules diff --git a/debian/installer/armhf/modules/armhf-armmp/i2c-modules b/debian/installer/modules/armhf-armmp/i2c-modules similarity index 100% rename from debian/installer/armhf/modules/armhf-armmp/i2c-modules rename to debian/installer/modules/armhf-armmp/i2c-modules diff --git a/debian/installer/armhf/modules/armhf-armmp/input-modules b/debian/installer/modules/armhf-armmp/input-modules similarity index 100% rename from debian/installer/armhf/modules/armhf-armmp/input-modules rename to debian/installer/modules/armhf-armmp/input-modules diff --git a/debian/installer/armhf/modules/armhf-armmp/isofs-modules b/debian/installer/modules/armhf-armmp/isofs-modules similarity index 100% rename from debian/installer/armhf/modules/armhf-armmp/isofs-modules rename to debian/installer/modules/armhf-armmp/isofs-modules diff --git a/debian/installer/armhf/modules/armhf-armmp/jfs-modules b/debian/installer/modules/armhf-armmp/jfs-modules similarity index 100% rename from debian/installer/armhf/modules/armhf-armmp/jfs-modules rename to debian/installer/modules/armhf-armmp/jfs-modules diff --git a/debian/installer/armhf/modules/armhf-armmp/kernel-image b/debian/installer/modules/armhf-armmp/kernel-image similarity index 100% rename from debian/installer/armhf/modules/armhf-armmp/kernel-image rename to debian/installer/modules/armhf-armmp/kernel-image diff --git a/debian/installer/armhf/modules/armhf-armmp/leds-modules b/debian/installer/modules/armhf-armmp/leds-modules similarity index 100% rename from debian/installer/armhf/modules/armhf-armmp/leds-modules rename to debian/installer/modules/armhf-armmp/leds-modules diff --git a/debian/installer/armhf/modules/armhf-armmp/loop-modules b/debian/installer/modules/armhf-armmp/loop-modules similarity index 100% rename from debian/installer/armhf/modules/armhf-armmp/loop-modules rename to debian/installer/modules/armhf-armmp/loop-modules diff --git a/debian/installer/armhf/modules/armhf-armmp/md-modules b/debian/installer/modules/armhf-armmp/md-modules similarity index 100% rename from debian/installer/armhf/modules/armhf-armmp/md-modules rename to debian/installer/modules/armhf-armmp/md-modules diff --git a/debian/installer/armhf/modules/armhf-armmp/mmc-modules b/debian/installer/modules/armhf-armmp/mmc-modules similarity index 100% rename from debian/installer/armhf/modules/armhf-armmp/mmc-modules rename to debian/installer/modules/armhf-armmp/mmc-modules diff --git a/debian/installer/armhf/modules/armhf-armmp/mtd-modules b/debian/installer/modules/armhf-armmp/mtd-modules similarity index 100% rename from debian/installer/armhf/modules/armhf-armmp/mtd-modules rename to debian/installer/modules/armhf-armmp/mtd-modules diff --git a/debian/installer/armhf/modules/armhf-armmp/multipath-modules b/debian/installer/modules/armhf-armmp/multipath-modules similarity index 100% rename from debian/installer/armhf/modules/armhf-armmp/multipath-modules rename to debian/installer/modules/armhf-armmp/multipath-modules diff --git a/debian/installer/armhf/modules/armhf-armmp/nbd-modules b/debian/installer/modules/armhf-armmp/nbd-modules similarity index 100% rename from debian/installer/armhf/modules/armhf-armmp/nbd-modules rename to debian/installer/modules/armhf-armmp/nbd-modules diff --git a/debian/installer/armhf/modules/armhf-armmp/nic-modules b/debian/installer/modules/armhf-armmp/nic-modules similarity index 100% rename from debian/installer/armhf/modules/armhf-armmp/nic-modules rename to debian/installer/modules/armhf-armmp/nic-modules diff --git a/debian/installer/armhf/modules/armhf-armmp/nic-shared-modules b/debian/installer/modules/armhf-armmp/nic-shared-modules similarity index 100% rename from debian/installer/armhf/modules/armhf-armmp/nic-shared-modules rename to debian/installer/modules/armhf-armmp/nic-shared-modules diff --git a/debian/installer/armhf/modules/armhf-armmp/nic-usb-modules b/debian/installer/modules/armhf-armmp/nic-usb-modules similarity index 100% rename from debian/installer/armhf/modules/armhf-armmp/nic-usb-modules rename to debian/installer/modules/armhf-armmp/nic-usb-modules diff --git a/debian/installer/armhf/modules/armhf-armmp/nic-wireless-modules b/debian/installer/modules/armhf-armmp/nic-wireless-modules similarity index 100% rename from debian/installer/armhf/modules/armhf-armmp/nic-wireless-modules rename to debian/installer/modules/armhf-armmp/nic-wireless-modules diff --git a/debian/installer/armhf/modules/armhf-armmp/pata-modules b/debian/installer/modules/armhf-armmp/pata-modules similarity index 100% rename from debian/installer/armhf/modules/armhf-armmp/pata-modules rename to debian/installer/modules/armhf-armmp/pata-modules diff --git a/debian/installer/armhf/modules/armhf-armmp/ppp-modules b/debian/installer/modules/armhf-armmp/ppp-modules similarity index 100% rename from debian/installer/armhf/modules/armhf-armmp/ppp-modules rename to debian/installer/modules/armhf-armmp/ppp-modules diff --git a/debian/installer/armhf/modules/armhf-armmp/sata-modules b/debian/installer/modules/armhf-armmp/sata-modules similarity index 100% rename from debian/installer/armhf/modules/armhf-armmp/sata-modules rename to debian/installer/modules/armhf-armmp/sata-modules diff --git a/debian/installer/armhf/modules/armhf-armmp/scsi-core-modules b/debian/installer/modules/armhf-armmp/scsi-core-modules similarity index 100% rename from debian/installer/armhf/modules/armhf-armmp/scsi-core-modules rename to debian/installer/modules/armhf-armmp/scsi-core-modules diff --git a/debian/installer/armhf/modules/armhf-armmp/scsi-modules b/debian/installer/modules/armhf-armmp/scsi-modules similarity index 100% rename from debian/installer/armhf/modules/armhf-armmp/scsi-modules rename to debian/installer/modules/armhf-armmp/scsi-modules diff --git a/debian/installer/armhf/modules/armhf-armmp/squashfs-modules b/debian/installer/modules/armhf-armmp/squashfs-modules similarity index 100% rename from debian/installer/armhf/modules/armhf-armmp/squashfs-modules rename to debian/installer/modules/armhf-armmp/squashfs-modules diff --git a/debian/installer/armhf/modules/armhf-armmp/udf-modules b/debian/installer/modules/armhf-armmp/udf-modules similarity index 100% rename from debian/installer/armhf/modules/armhf-armmp/udf-modules rename to debian/installer/modules/armhf-armmp/udf-modules diff --git a/debian/installer/armhf/modules/armhf-armmp/uinput-modules b/debian/installer/modules/armhf-armmp/uinput-modules similarity index 100% rename from debian/installer/armhf/modules/armhf-armmp/uinput-modules rename to debian/installer/modules/armhf-armmp/uinput-modules diff --git a/debian/installer/armhf/modules/armhf-armmp/usb-modules b/debian/installer/modules/armhf-armmp/usb-modules similarity index 100% rename from debian/installer/armhf/modules/armhf-armmp/usb-modules rename to debian/installer/modules/armhf-armmp/usb-modules diff --git a/debian/installer/armhf/modules/armhf-armmp/usb-storage-modules b/debian/installer/modules/armhf-armmp/usb-storage-modules similarity index 100% rename from debian/installer/armhf/modules/armhf-armmp/usb-storage-modules rename to debian/installer/modules/armhf-armmp/usb-storage-modules diff --git a/debian/installer/armhf/modules/armhf-armmp/virtio-modules b/debian/installer/modules/armhf-armmp/virtio-modules similarity index 100% rename from debian/installer/armhf/modules/armhf-armmp/virtio-modules rename to debian/installer/modules/armhf-armmp/virtio-modules diff --git a/debian/installer/armhf/modules/armhf-armmp/zlib-modules b/debian/installer/modules/armhf-armmp/zlib-modules similarity index 100% rename from debian/installer/armhf/modules/armhf-armmp/zlib-modules rename to debian/installer/modules/armhf-armmp/zlib-modules diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/ata-modules b/debian/installer/modules/hppa-parisc64-smp/ata-modules similarity index 100% rename from debian/installer/hppa/modules/hppa-parisc64-smp/ata-modules rename to debian/installer/modules/hppa-parisc64-smp/ata-modules diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/btrfs-modules b/debian/installer/modules/hppa-parisc64-smp/btrfs-modules similarity index 100% rename from debian/installer/hppa/modules/hppa-parisc64-smp/btrfs-modules rename to debian/installer/modules/hppa-parisc64-smp/btrfs-modules diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/cdrom-core-modules b/debian/installer/modules/hppa-parisc64-smp/cdrom-core-modules similarity index 100% rename from debian/installer/hppa/modules/hppa-parisc64-smp/cdrom-core-modules rename to debian/installer/modules/hppa-parisc64-smp/cdrom-core-modules diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/compress-modules b/debian/installer/modules/hppa-parisc64-smp/compress-modules similarity index 100% rename from debian/installer/hppa/modules/hppa-parisc64-smp/compress-modules rename to debian/installer/modules/hppa-parisc64-smp/compress-modules diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/crc-modules b/debian/installer/modules/hppa-parisc64-smp/crc-modules similarity index 100% rename from debian/installer/hppa/modules/hppa-parisc64-smp/crc-modules rename to debian/installer/modules/hppa-parisc64-smp/crc-modules diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/crypto-dm-modules b/debian/installer/modules/hppa-parisc64-smp/crypto-dm-modules similarity index 100% rename from debian/installer/hppa/modules/hppa-parisc64-smp/crypto-dm-modules rename to debian/installer/modules/hppa-parisc64-smp/crypto-dm-modules diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/crypto-modules b/debian/installer/modules/hppa-parisc64-smp/crypto-modules similarity index 100% rename from debian/installer/hppa/modules/hppa-parisc64-smp/crypto-modules rename to debian/installer/modules/hppa-parisc64-smp/crypto-modules diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/event-modules b/debian/installer/modules/hppa-parisc64-smp/event-modules similarity index 100% rename from debian/installer/hppa/modules/hppa-parisc64-smp/event-modules rename to debian/installer/modules/hppa-parisc64-smp/event-modules diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/ext4-modules b/debian/installer/modules/hppa-parisc64-smp/ext4-modules similarity index 100% rename from debian/installer/hppa/modules/hppa-parisc64-smp/ext4-modules rename to debian/installer/modules/hppa-parisc64-smp/ext4-modules diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/fat-modules b/debian/installer/modules/hppa-parisc64-smp/fat-modules similarity index 100% rename from debian/installer/hppa/modules/hppa-parisc64-smp/fat-modules rename to debian/installer/modules/hppa-parisc64-smp/fat-modules diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/fb-modules b/debian/installer/modules/hppa-parisc64-smp/fb-modules similarity index 100% rename from debian/installer/hppa/modules/hppa-parisc64-smp/fb-modules rename to debian/installer/modules/hppa-parisc64-smp/fb-modules diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/fuse-modules b/debian/installer/modules/hppa-parisc64-smp/fuse-modules similarity index 100% rename from debian/installer/hppa/modules/hppa-parisc64-smp/fuse-modules rename to debian/installer/modules/hppa-parisc64-smp/fuse-modules diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/input-modules b/debian/installer/modules/hppa-parisc64-smp/input-modules similarity index 100% rename from debian/installer/hppa/modules/hppa-parisc64-smp/input-modules rename to debian/installer/modules/hppa-parisc64-smp/input-modules diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/isofs-modules b/debian/installer/modules/hppa-parisc64-smp/isofs-modules similarity index 100% rename from debian/installer/hppa/modules/hppa-parisc64-smp/isofs-modules rename to debian/installer/modules/hppa-parisc64-smp/isofs-modules diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/jfs-modules b/debian/installer/modules/hppa-parisc64-smp/jfs-modules similarity index 100% rename from debian/installer/hppa/modules/hppa-parisc64-smp/jfs-modules rename to debian/installer/modules/hppa-parisc64-smp/jfs-modules diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/kernel-image b/debian/installer/modules/hppa-parisc64-smp/kernel-image similarity index 100% rename from debian/installer/hppa/modules/hppa-parisc64-smp/kernel-image rename to debian/installer/modules/hppa-parisc64-smp/kernel-image diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/loop-modules b/debian/installer/modules/hppa-parisc64-smp/loop-modules similarity index 100% rename from debian/installer/hppa/modules/hppa-parisc64-smp/loop-modules rename to debian/installer/modules/hppa-parisc64-smp/loop-modules diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/md-modules b/debian/installer/modules/hppa-parisc64-smp/md-modules similarity index 100% rename from debian/installer/hppa/modules/hppa-parisc64-smp/md-modules rename to debian/installer/modules/hppa-parisc64-smp/md-modules diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/mouse-modules b/debian/installer/modules/hppa-parisc64-smp/mouse-modules similarity index 100% rename from debian/installer/hppa/modules/hppa-parisc64-smp/mouse-modules rename to debian/installer/modules/hppa-parisc64-smp/mouse-modules diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/multipath-modules b/debian/installer/modules/hppa-parisc64-smp/multipath-modules similarity index 100% rename from debian/installer/hppa/modules/hppa-parisc64-smp/multipath-modules rename to debian/installer/modules/hppa-parisc64-smp/multipath-modules diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/nbd-modules b/debian/installer/modules/hppa-parisc64-smp/nbd-modules similarity index 100% rename from debian/installer/hppa/modules/hppa-parisc64-smp/nbd-modules rename to debian/installer/modules/hppa-parisc64-smp/nbd-modules diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/nic-modules b/debian/installer/modules/hppa-parisc64-smp/nic-modules similarity index 100% rename from debian/installer/hppa/modules/hppa-parisc64-smp/nic-modules rename to debian/installer/modules/hppa-parisc64-smp/nic-modules diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/nic-shared-modules b/debian/installer/modules/hppa-parisc64-smp/nic-shared-modules similarity index 100% rename from debian/installer/hppa/modules/hppa-parisc64-smp/nic-shared-modules rename to debian/installer/modules/hppa-parisc64-smp/nic-shared-modules diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/nic-usb-modules b/debian/installer/modules/hppa-parisc64-smp/nic-usb-modules similarity index 100% rename from debian/installer/hppa/modules/hppa-parisc64-smp/nic-usb-modules rename to debian/installer/modules/hppa-parisc64-smp/nic-usb-modules diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/pata-modules b/debian/installer/modules/hppa-parisc64-smp/pata-modules similarity index 100% rename from debian/installer/hppa/modules/hppa-parisc64-smp/pata-modules rename to debian/installer/modules/hppa-parisc64-smp/pata-modules diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/ppp-modules b/debian/installer/modules/hppa-parisc64-smp/ppp-modules similarity index 100% rename from debian/installer/hppa/modules/hppa-parisc64-smp/ppp-modules rename to debian/installer/modules/hppa-parisc64-smp/ppp-modules diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/sata-modules b/debian/installer/modules/hppa-parisc64-smp/sata-modules similarity index 100% rename from debian/installer/hppa/modules/hppa-parisc64-smp/sata-modules rename to debian/installer/modules/hppa-parisc64-smp/sata-modules diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/scsi-core-modules b/debian/installer/modules/hppa-parisc64-smp/scsi-core-modules similarity index 100% rename from debian/installer/hppa/modules/hppa-parisc64-smp/scsi-core-modules rename to debian/installer/modules/hppa-parisc64-smp/scsi-core-modules diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/scsi-modules b/debian/installer/modules/hppa-parisc64-smp/scsi-modules similarity index 100% rename from debian/installer/hppa/modules/hppa-parisc64-smp/scsi-modules rename to debian/installer/modules/hppa-parisc64-smp/scsi-modules diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/serial-modules b/debian/installer/modules/hppa-parisc64-smp/serial-modules similarity index 100% rename from debian/installer/hppa/modules/hppa-parisc64-smp/serial-modules rename to debian/installer/modules/hppa-parisc64-smp/serial-modules diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/squashfs-modules b/debian/installer/modules/hppa-parisc64-smp/squashfs-modules similarity index 100% rename from debian/installer/hppa/modules/hppa-parisc64-smp/squashfs-modules rename to debian/installer/modules/hppa-parisc64-smp/squashfs-modules diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/usb-modules b/debian/installer/modules/hppa-parisc64-smp/usb-modules similarity index 100% rename from debian/installer/hppa/modules/hppa-parisc64-smp/usb-modules rename to debian/installer/modules/hppa-parisc64-smp/usb-modules diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/usb-serial-modules b/debian/installer/modules/hppa-parisc64-smp/usb-serial-modules similarity index 100% rename from debian/installer/hppa/modules/hppa-parisc64-smp/usb-serial-modules rename to debian/installer/modules/hppa-parisc64-smp/usb-serial-modules diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/usb-storage-modules b/debian/installer/modules/hppa-parisc64-smp/usb-storage-modules similarity index 100% rename from debian/installer/hppa/modules/hppa-parisc64-smp/usb-storage-modules rename to debian/installer/modules/hppa-parisc64-smp/usb-storage-modules diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/virtio-modules b/debian/installer/modules/hppa-parisc64-smp/virtio-modules similarity index 100% rename from debian/installer/hppa/modules/hppa-parisc64-smp/virtio-modules rename to debian/installer/modules/hppa-parisc64-smp/virtio-modules diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/xfs-modules b/debian/installer/modules/hppa-parisc64-smp/xfs-modules similarity index 100% rename from debian/installer/hppa/modules/hppa-parisc64-smp/xfs-modules rename to debian/installer/modules/hppa-parisc64-smp/xfs-modules diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/zlib-modules b/debian/installer/modules/hppa-parisc64-smp/zlib-modules similarity index 100% rename from debian/installer/hppa/modules/hppa-parisc64-smp/zlib-modules rename to debian/installer/modules/hppa-parisc64-smp/zlib-modules diff --git a/debian/installer/hppa/modules/hppa/ata-modules b/debian/installer/modules/hppa/ata-modules similarity index 100% rename from debian/installer/hppa/modules/hppa/ata-modules rename to debian/installer/modules/hppa/ata-modules diff --git a/debian/installer/hppa/modules/hppa/btrfs-modules b/debian/installer/modules/hppa/btrfs-modules similarity index 100% rename from debian/installer/hppa/modules/hppa/btrfs-modules rename to debian/installer/modules/hppa/btrfs-modules diff --git a/debian/installer/hppa/modules/hppa/cdrom-core-modules b/debian/installer/modules/hppa/cdrom-core-modules similarity index 100% rename from debian/installer/hppa/modules/hppa/cdrom-core-modules rename to debian/installer/modules/hppa/cdrom-core-modules diff --git a/debian/installer/hppa/modules/hppa/compress-modules b/debian/installer/modules/hppa/compress-modules similarity index 100% rename from debian/installer/hppa/modules/hppa/compress-modules rename to debian/installer/modules/hppa/compress-modules diff --git a/debian/installer/hppa/modules/hppa/crc-modules b/debian/installer/modules/hppa/crc-modules similarity index 100% rename from debian/installer/hppa/modules/hppa/crc-modules rename to debian/installer/modules/hppa/crc-modules diff --git a/debian/installer/hppa/modules/hppa/crypto-dm-modules b/debian/installer/modules/hppa/crypto-dm-modules similarity index 100% rename from debian/installer/hppa/modules/hppa/crypto-dm-modules rename to debian/installer/modules/hppa/crypto-dm-modules diff --git a/debian/installer/hppa/modules/hppa/crypto-modules b/debian/installer/modules/hppa/crypto-modules similarity index 100% rename from debian/installer/hppa/modules/hppa/crypto-modules rename to debian/installer/modules/hppa/crypto-modules diff --git a/debian/installer/hppa/modules/hppa/event-modules b/debian/installer/modules/hppa/event-modules similarity index 100% rename from debian/installer/hppa/modules/hppa/event-modules rename to debian/installer/modules/hppa/event-modules diff --git a/debian/installer/hppa/modules/hppa/ext4-modules b/debian/installer/modules/hppa/ext4-modules similarity index 100% rename from debian/installer/hppa/modules/hppa/ext4-modules rename to debian/installer/modules/hppa/ext4-modules diff --git a/debian/installer/hppa/modules/hppa/fat-modules b/debian/installer/modules/hppa/fat-modules similarity index 100% rename from debian/installer/hppa/modules/hppa/fat-modules rename to debian/installer/modules/hppa/fat-modules diff --git a/debian/installer/hppa/modules/hppa/fuse-modules b/debian/installer/modules/hppa/fuse-modules similarity index 100% rename from debian/installer/hppa/modules/hppa/fuse-modules rename to debian/installer/modules/hppa/fuse-modules diff --git a/debian/installer/hppa/modules/hppa/input-modules b/debian/installer/modules/hppa/input-modules similarity index 100% rename from debian/installer/hppa/modules/hppa/input-modules rename to debian/installer/modules/hppa/input-modules diff --git a/debian/installer/hppa/modules/hppa/isofs-modules b/debian/installer/modules/hppa/isofs-modules similarity index 100% rename from debian/installer/hppa/modules/hppa/isofs-modules rename to debian/installer/modules/hppa/isofs-modules diff --git a/debian/installer/hppa/modules/hppa/jfs-modules b/debian/installer/modules/hppa/jfs-modules similarity index 100% rename from debian/installer/hppa/modules/hppa/jfs-modules rename to debian/installer/modules/hppa/jfs-modules diff --git a/debian/installer/hppa/modules/hppa/kernel-image b/debian/installer/modules/hppa/kernel-image similarity index 100% rename from debian/installer/hppa/modules/hppa/kernel-image rename to debian/installer/modules/hppa/kernel-image diff --git a/debian/installer/hppa/modules/hppa/loop-modules b/debian/installer/modules/hppa/loop-modules similarity index 100% rename from debian/installer/hppa/modules/hppa/loop-modules rename to debian/installer/modules/hppa/loop-modules diff --git a/debian/installer/hppa/modules/hppa/md-modules b/debian/installer/modules/hppa/md-modules similarity index 100% rename from debian/installer/hppa/modules/hppa/md-modules rename to debian/installer/modules/hppa/md-modules diff --git a/debian/installer/hppa/modules/hppa/mouse-modules b/debian/installer/modules/hppa/mouse-modules similarity index 100% rename from debian/installer/hppa/modules/hppa/mouse-modules rename to debian/installer/modules/hppa/mouse-modules diff --git a/debian/installer/hppa/modules/hppa/multipath-modules b/debian/installer/modules/hppa/multipath-modules similarity index 100% rename from debian/installer/hppa/modules/hppa/multipath-modules rename to debian/installer/modules/hppa/multipath-modules diff --git a/debian/installer/hppa/modules/hppa/nbd-modules b/debian/installer/modules/hppa/nbd-modules similarity index 100% rename from debian/installer/hppa/modules/hppa/nbd-modules rename to debian/installer/modules/hppa/nbd-modules diff --git a/debian/installer/hppa/modules/hppa/nic-modules b/debian/installer/modules/hppa/nic-modules similarity index 100% rename from debian/installer/hppa/modules/hppa/nic-modules rename to debian/installer/modules/hppa/nic-modules diff --git a/debian/installer/hppa/modules/hppa/nic-shared-modules b/debian/installer/modules/hppa/nic-shared-modules similarity index 100% rename from debian/installer/hppa/modules/hppa/nic-shared-modules rename to debian/installer/modules/hppa/nic-shared-modules diff --git a/debian/installer/hppa/modules/hppa/nic-usb-modules b/debian/installer/modules/hppa/nic-usb-modules similarity index 100% rename from debian/installer/hppa/modules/hppa/nic-usb-modules rename to debian/installer/modules/hppa/nic-usb-modules diff --git a/debian/installer/hppa/modules/hppa/pata-modules b/debian/installer/modules/hppa/pata-modules similarity index 100% rename from debian/installer/hppa/modules/hppa/pata-modules rename to debian/installer/modules/hppa/pata-modules diff --git a/debian/installer/hppa/modules/hppa/ppp-modules b/debian/installer/modules/hppa/ppp-modules similarity index 100% rename from debian/installer/hppa/modules/hppa/ppp-modules rename to debian/installer/modules/hppa/ppp-modules diff --git a/debian/installer/hppa/modules/hppa/sata-modules b/debian/installer/modules/hppa/sata-modules similarity index 100% rename from debian/installer/hppa/modules/hppa/sata-modules rename to debian/installer/modules/hppa/sata-modules diff --git a/debian/installer/hppa/modules/hppa/scsi-core-modules b/debian/installer/modules/hppa/scsi-core-modules similarity index 100% rename from debian/installer/hppa/modules/hppa/scsi-core-modules rename to debian/installer/modules/hppa/scsi-core-modules diff --git a/debian/installer/hppa/modules/hppa/scsi-modules b/debian/installer/modules/hppa/scsi-modules similarity index 100% rename from debian/installer/hppa/modules/hppa/scsi-modules rename to debian/installer/modules/hppa/scsi-modules diff --git a/debian/installer/hppa/modules/hppa/serial-modules b/debian/installer/modules/hppa/serial-modules similarity index 100% rename from debian/installer/hppa/modules/hppa/serial-modules rename to debian/installer/modules/hppa/serial-modules diff --git a/debian/installer/hppa/modules/hppa/squashfs-modules b/debian/installer/modules/hppa/squashfs-modules similarity index 100% rename from debian/installer/hppa/modules/hppa/squashfs-modules rename to debian/installer/modules/hppa/squashfs-modules diff --git a/debian/installer/hppa/modules/hppa/usb-modules b/debian/installer/modules/hppa/usb-modules similarity index 100% rename from debian/installer/hppa/modules/hppa/usb-modules rename to debian/installer/modules/hppa/usb-modules diff --git a/debian/installer/hppa/modules/hppa/usb-serial-modules b/debian/installer/modules/hppa/usb-serial-modules similarity index 100% rename from debian/installer/hppa/modules/hppa/usb-serial-modules rename to debian/installer/modules/hppa/usb-serial-modules diff --git a/debian/installer/hppa/modules/hppa/usb-storage-modules b/debian/installer/modules/hppa/usb-storage-modules similarity index 100% rename from debian/installer/hppa/modules/hppa/usb-storage-modules rename to debian/installer/modules/hppa/usb-storage-modules diff --git a/debian/installer/hppa/modules/hppa/virtio-modules b/debian/installer/modules/hppa/virtio-modules similarity index 100% rename from debian/installer/hppa/modules/hppa/virtio-modules rename to debian/installer/modules/hppa/virtio-modules diff --git a/debian/installer/hppa/modules/hppa/xfs-modules b/debian/installer/modules/hppa/xfs-modules similarity index 100% rename from debian/installer/hppa/modules/hppa/xfs-modules rename to debian/installer/modules/hppa/xfs-modules diff --git a/debian/installer/hppa/modules/hppa/zlib-modules b/debian/installer/modules/hppa/zlib-modules similarity index 100% rename from debian/installer/hppa/modules/hppa/zlib-modules rename to debian/installer/modules/hppa/zlib-modules diff --git a/debian/installer/i386/modules/i386/acpi-modules b/debian/installer/modules/i386/acpi-modules similarity index 100% rename from debian/installer/i386/modules/i386/acpi-modules rename to debian/installer/modules/i386/acpi-modules diff --git a/debian/installer/i386/modules/i386/ata-modules b/debian/installer/modules/i386/ata-modules similarity index 100% rename from debian/installer/i386/modules/i386/ata-modules rename to debian/installer/modules/i386/ata-modules diff --git a/debian/installer/i386/modules/i386/btrfs-modules b/debian/installer/modules/i386/btrfs-modules similarity index 100% rename from debian/installer/i386/modules/i386/btrfs-modules rename to debian/installer/modules/i386/btrfs-modules diff --git a/debian/installer/i386/modules/i386/cdrom-core-modules b/debian/installer/modules/i386/cdrom-core-modules similarity index 100% rename from debian/installer/i386/modules/i386/cdrom-core-modules rename to debian/installer/modules/i386/cdrom-core-modules diff --git a/debian/installer/i386/modules/i386/compress-modules b/debian/installer/modules/i386/compress-modules similarity index 100% rename from debian/installer/i386/modules/i386/compress-modules rename to debian/installer/modules/i386/compress-modules diff --git a/debian/installer/i386/modules/i386/crc-modules b/debian/installer/modules/i386/crc-modules similarity index 100% rename from debian/installer/i386/modules/i386/crc-modules rename to debian/installer/modules/i386/crc-modules diff --git a/debian/installer/i386/modules/i386/crypto-dm-modules b/debian/installer/modules/i386/crypto-dm-modules similarity index 100% rename from debian/installer/i386/modules/i386/crypto-dm-modules rename to debian/installer/modules/i386/crypto-dm-modules diff --git a/debian/installer/i386/modules/i386/crypto-modules b/debian/installer/modules/i386/crypto-modules similarity index 100% rename from debian/installer/i386/modules/i386/crypto-modules rename to debian/installer/modules/i386/crypto-modules diff --git a/debian/installer/i386/modules/i386/efi-modules b/debian/installer/modules/i386/efi-modules similarity index 100% rename from debian/installer/i386/modules/i386/efi-modules rename to debian/installer/modules/i386/efi-modules diff --git a/debian/installer/i386/modules/i386/event-modules b/debian/installer/modules/i386/event-modules similarity index 100% rename from debian/installer/i386/modules/i386/event-modules rename to debian/installer/modules/i386/event-modules diff --git a/debian/installer/i386/modules/i386/ext4-modules b/debian/installer/modules/i386/ext4-modules similarity index 100% rename from debian/installer/i386/modules/i386/ext4-modules rename to debian/installer/modules/i386/ext4-modules diff --git a/debian/installer/i386/modules/i386/fat-modules b/debian/installer/modules/i386/fat-modules similarity index 100% rename from debian/installer/i386/modules/i386/fat-modules rename to debian/installer/modules/i386/fat-modules diff --git a/debian/installer/i386/modules/i386/fb-modules b/debian/installer/modules/i386/fb-modules similarity index 100% rename from debian/installer/i386/modules/i386/fb-modules rename to debian/installer/modules/i386/fb-modules diff --git a/debian/installer/i386/modules/i386/firewire-core-modules b/debian/installer/modules/i386/firewire-core-modules similarity index 100% rename from debian/installer/i386/modules/i386/firewire-core-modules rename to debian/installer/modules/i386/firewire-core-modules diff --git a/debian/installer/i386/modules/i386/fuse-modules b/debian/installer/modules/i386/fuse-modules similarity index 100% rename from debian/installer/i386/modules/i386/fuse-modules rename to debian/installer/modules/i386/fuse-modules diff --git a/debian/installer/i386/modules/i386/hyperv-modules b/debian/installer/modules/i386/hyperv-modules similarity index 100% rename from debian/installer/i386/modules/i386/hyperv-modules rename to debian/installer/modules/i386/hyperv-modules diff --git a/debian/installer/i386/modules/i386/i2c-modules b/debian/installer/modules/i386/i2c-modules similarity index 100% rename from debian/installer/i386/modules/i386/i2c-modules rename to debian/installer/modules/i386/i2c-modules diff --git a/debian/installer/i386/modules/i386/input-modules b/debian/installer/modules/i386/input-modules similarity index 100% rename from debian/installer/i386/modules/i386/input-modules rename to debian/installer/modules/i386/input-modules diff --git a/debian/installer/i386/modules/i386/isofs-modules b/debian/installer/modules/i386/isofs-modules similarity index 100% rename from debian/installer/i386/modules/i386/isofs-modules rename to debian/installer/modules/i386/isofs-modules diff --git a/debian/installer/i386/modules/i386/jfs-modules b/debian/installer/modules/i386/jfs-modules similarity index 100% rename from debian/installer/i386/modules/i386/jfs-modules rename to debian/installer/modules/i386/jfs-modules diff --git a/debian/installer/i386/modules/i386/kernel-image b/debian/installer/modules/i386/kernel-image similarity index 100% rename from debian/installer/i386/modules/i386/kernel-image rename to debian/installer/modules/i386/kernel-image diff --git a/debian/installer/i386/modules/i386/loop-modules b/debian/installer/modules/i386/loop-modules similarity index 100% rename from debian/installer/i386/modules/i386/loop-modules rename to debian/installer/modules/i386/loop-modules diff --git a/debian/installer/i386/modules/i386/md-modules b/debian/installer/modules/i386/md-modules similarity index 100% rename from debian/installer/i386/modules/i386/md-modules rename to debian/installer/modules/i386/md-modules diff --git a/debian/installer/i386/modules/i386/mmc-core-modules b/debian/installer/modules/i386/mmc-core-modules similarity index 100% rename from debian/installer/i386/modules/i386/mmc-core-modules rename to debian/installer/modules/i386/mmc-core-modules diff --git a/debian/installer/i386/modules/i386/mmc-modules b/debian/installer/modules/i386/mmc-modules similarity index 100% rename from debian/installer/i386/modules/i386/mmc-modules rename to debian/installer/modules/i386/mmc-modules diff --git a/debian/installer/i386/modules/i386/mouse-modules b/debian/installer/modules/i386/mouse-modules similarity index 100% rename from debian/installer/i386/modules/i386/mouse-modules rename to debian/installer/modules/i386/mouse-modules diff --git a/debian/installer/i386/modules/i386/multipath-modules b/debian/installer/modules/i386/multipath-modules similarity index 100% rename from debian/installer/i386/modules/i386/multipath-modules rename to debian/installer/modules/i386/multipath-modules diff --git a/debian/installer/i386/modules/i386/nbd-modules b/debian/installer/modules/i386/nbd-modules similarity index 100% rename from debian/installer/i386/modules/i386/nbd-modules rename to debian/installer/modules/i386/nbd-modules diff --git a/debian/installer/i386/modules/i386/nic-modules b/debian/installer/modules/i386/nic-modules similarity index 100% rename from debian/installer/i386/modules/i386/nic-modules rename to debian/installer/modules/i386/nic-modules diff --git a/debian/installer/i386/modules/i386/nic-pcmcia-modules b/debian/installer/modules/i386/nic-pcmcia-modules similarity index 100% rename from debian/installer/i386/modules/i386/nic-pcmcia-modules rename to debian/installer/modules/i386/nic-pcmcia-modules diff --git a/debian/installer/i386/modules/i386/nic-shared-modules b/debian/installer/modules/i386/nic-shared-modules similarity index 100% rename from debian/installer/i386/modules/i386/nic-shared-modules rename to debian/installer/modules/i386/nic-shared-modules diff --git a/debian/installer/i386/modules/i386/nic-usb-modules b/debian/installer/modules/i386/nic-usb-modules similarity index 100% rename from debian/installer/i386/modules/i386/nic-usb-modules rename to debian/installer/modules/i386/nic-usb-modules diff --git a/debian/installer/i386/modules/i386/nic-wireless-modules b/debian/installer/modules/i386/nic-wireless-modules similarity index 100% rename from debian/installer/i386/modules/i386/nic-wireless-modules rename to debian/installer/modules/i386/nic-wireless-modules diff --git a/debian/installer/i386/modules/i386/ntfs-modules b/debian/installer/modules/i386/ntfs-modules similarity index 100% rename from debian/installer/i386/modules/i386/ntfs-modules rename to debian/installer/modules/i386/ntfs-modules diff --git a/debian/installer/i386/modules/i386/pata-modules b/debian/installer/modules/i386/pata-modules similarity index 100% rename from debian/installer/i386/modules/i386/pata-modules rename to debian/installer/modules/i386/pata-modules diff --git a/debian/installer/i386/modules/i386/pcmcia-modules b/debian/installer/modules/i386/pcmcia-modules similarity index 100% rename from debian/installer/i386/modules/i386/pcmcia-modules rename to debian/installer/modules/i386/pcmcia-modules diff --git a/debian/installer/i386/modules/i386/pcmcia-storage-modules b/debian/installer/modules/i386/pcmcia-storage-modules similarity index 100% rename from debian/installer/i386/modules/i386/pcmcia-storage-modules rename to debian/installer/modules/i386/pcmcia-storage-modules diff --git a/debian/installer/i386/modules/i386/ppp-modules b/debian/installer/modules/i386/ppp-modules similarity index 100% rename from debian/installer/i386/modules/i386/ppp-modules rename to debian/installer/modules/i386/ppp-modules diff --git a/debian/installer/i386/modules/i386/sata-modules b/debian/installer/modules/i386/sata-modules similarity index 100% rename from debian/installer/i386/modules/i386/sata-modules rename to debian/installer/modules/i386/sata-modules diff --git a/debian/installer/i386/modules/i386/scsi-core-modules b/debian/installer/modules/i386/scsi-core-modules similarity index 100% rename from debian/installer/i386/modules/i386/scsi-core-modules rename to debian/installer/modules/i386/scsi-core-modules diff --git a/debian/installer/i386/modules/i386/scsi-modules b/debian/installer/modules/i386/scsi-modules similarity index 100% rename from debian/installer/i386/modules/i386/scsi-modules rename to debian/installer/modules/i386/scsi-modules diff --git a/debian/installer/i386/modules/i386/serial-modules b/debian/installer/modules/i386/serial-modules similarity index 100% rename from debian/installer/i386/modules/i386/serial-modules rename to debian/installer/modules/i386/serial-modules diff --git a/debian/installer/i386/modules/i386/sound-modules b/debian/installer/modules/i386/sound-modules similarity index 100% rename from debian/installer/i386/modules/i386/sound-modules rename to debian/installer/modules/i386/sound-modules diff --git a/debian/installer/i386/modules/i386/speakup-modules b/debian/installer/modules/i386/speakup-modules similarity index 100% rename from debian/installer/i386/modules/i386/speakup-modules rename to debian/installer/modules/i386/speakup-modules diff --git a/debian/installer/i386/modules/i386/squashfs-modules b/debian/installer/modules/i386/squashfs-modules similarity index 100% rename from debian/installer/i386/modules/i386/squashfs-modules rename to debian/installer/modules/i386/squashfs-modules diff --git a/debian/installer/i386/modules/i386/udf-modules b/debian/installer/modules/i386/udf-modules similarity index 100% rename from debian/installer/i386/modules/i386/udf-modules rename to debian/installer/modules/i386/udf-modules diff --git a/debian/installer/i386/modules/i386/uinput-modules b/debian/installer/modules/i386/uinput-modules similarity index 100% rename from debian/installer/i386/modules/i386/uinput-modules rename to debian/installer/modules/i386/uinput-modules diff --git a/debian/installer/i386/modules/i386/usb-modules b/debian/installer/modules/i386/usb-modules similarity index 100% rename from debian/installer/i386/modules/i386/usb-modules rename to debian/installer/modules/i386/usb-modules diff --git a/debian/installer/i386/modules/i386/usb-serial-modules b/debian/installer/modules/i386/usb-serial-modules similarity index 100% rename from debian/installer/i386/modules/i386/usb-serial-modules rename to debian/installer/modules/i386/usb-serial-modules diff --git a/debian/installer/i386/modules/i386/usb-storage-modules b/debian/installer/modules/i386/usb-storage-modules similarity index 100% rename from debian/installer/i386/modules/i386/usb-storage-modules rename to debian/installer/modules/i386/usb-storage-modules diff --git a/debian/installer/i386/modules/i386/virtio-modules b/debian/installer/modules/i386/virtio-modules similarity index 100% rename from debian/installer/i386/modules/i386/virtio-modules rename to debian/installer/modules/i386/virtio-modules diff --git a/debian/installer/i386/modules/i386/xfs-modules b/debian/installer/modules/i386/xfs-modules similarity index 100% rename from debian/installer/i386/modules/i386/xfs-modules rename to debian/installer/modules/i386/xfs-modules diff --git a/debian/installer/ia64/modules/ia64/ata-modules b/debian/installer/modules/ia64/ata-modules similarity index 100% rename from debian/installer/ia64/modules/ia64/ata-modules rename to debian/installer/modules/ia64/ata-modules diff --git a/debian/installer/ia64/modules/ia64/btrfs-modules b/debian/installer/modules/ia64/btrfs-modules similarity index 100% rename from debian/installer/ia64/modules/ia64/btrfs-modules rename to debian/installer/modules/ia64/btrfs-modules diff --git a/debian/installer/ia64/modules/ia64/cdrom-core-modules b/debian/installer/modules/ia64/cdrom-core-modules similarity index 100% rename from debian/installer/ia64/modules/ia64/cdrom-core-modules rename to debian/installer/modules/ia64/cdrom-core-modules diff --git a/debian/installer/ia64/modules/ia64/compress-modules b/debian/installer/modules/ia64/compress-modules similarity index 100% rename from debian/installer/ia64/modules/ia64/compress-modules rename to debian/installer/modules/ia64/compress-modules diff --git a/debian/installer/ia64/modules/ia64/crc-modules b/debian/installer/modules/ia64/crc-modules similarity index 100% rename from debian/installer/ia64/modules/ia64/crc-modules rename to debian/installer/modules/ia64/crc-modules diff --git a/debian/installer/ia64/modules/ia64/crypto-dm-modules b/debian/installer/modules/ia64/crypto-dm-modules similarity index 100% rename from debian/installer/ia64/modules/ia64/crypto-dm-modules rename to debian/installer/modules/ia64/crypto-dm-modules diff --git a/debian/installer/ia64/modules/ia64/crypto-modules b/debian/installer/modules/ia64/crypto-modules similarity index 100% rename from debian/installer/ia64/modules/ia64/crypto-modules rename to debian/installer/modules/ia64/crypto-modules diff --git a/debian/installer/ia64/modules/ia64/event-modules b/debian/installer/modules/ia64/event-modules similarity index 100% rename from debian/installer/ia64/modules/ia64/event-modules rename to debian/installer/modules/ia64/event-modules diff --git a/debian/installer/ia64/modules/ia64/ext4-modules b/debian/installer/modules/ia64/ext4-modules similarity index 100% rename from debian/installer/ia64/modules/ia64/ext4-modules rename to debian/installer/modules/ia64/ext4-modules diff --git a/debian/installer/ia64/modules/ia64/fat-modules b/debian/installer/modules/ia64/fat-modules similarity index 100% rename from debian/installer/ia64/modules/ia64/fat-modules rename to debian/installer/modules/ia64/fat-modules diff --git a/debian/installer/ia64/modules/ia64/fb-modules b/debian/installer/modules/ia64/fb-modules similarity index 100% rename from debian/installer/ia64/modules/ia64/fb-modules rename to debian/installer/modules/ia64/fb-modules diff --git a/debian/installer/ia64/modules/ia64/firewire-core-modules b/debian/installer/modules/ia64/firewire-core-modules similarity index 100% rename from debian/installer/ia64/modules/ia64/firewire-core-modules rename to debian/installer/modules/ia64/firewire-core-modules diff --git a/debian/installer/ia64/modules/ia64/fuse-modules b/debian/installer/modules/ia64/fuse-modules similarity index 100% rename from debian/installer/ia64/modules/ia64/fuse-modules rename to debian/installer/modules/ia64/fuse-modules diff --git a/debian/installer/ia64/modules/ia64/i2c-modules b/debian/installer/modules/ia64/i2c-modules similarity index 100% rename from debian/installer/ia64/modules/ia64/i2c-modules rename to debian/installer/modules/ia64/i2c-modules diff --git a/debian/installer/ia64/modules/ia64/ide-core-modules b/debian/installer/modules/ia64/ide-core-modules similarity index 100% rename from debian/installer/ia64/modules/ia64/ide-core-modules rename to debian/installer/modules/ia64/ide-core-modules diff --git a/debian/installer/ia64/modules/ia64/ide-modules b/debian/installer/modules/ia64/ide-modules similarity index 100% rename from debian/installer/ia64/modules/ia64/ide-modules rename to debian/installer/modules/ia64/ide-modules diff --git a/debian/installer/ia64/modules/ia64/input-modules b/debian/installer/modules/ia64/input-modules similarity index 100% rename from debian/installer/ia64/modules/ia64/input-modules rename to debian/installer/modules/ia64/input-modules diff --git a/debian/installer/ia64/modules/ia64/isofs-modules b/debian/installer/modules/ia64/isofs-modules similarity index 100% rename from debian/installer/ia64/modules/ia64/isofs-modules rename to debian/installer/modules/ia64/isofs-modules diff --git a/debian/installer/ia64/modules/ia64/jfs-modules b/debian/installer/modules/ia64/jfs-modules similarity index 100% rename from debian/installer/ia64/modules/ia64/jfs-modules rename to debian/installer/modules/ia64/jfs-modules diff --git a/debian/installer/ia64/modules/ia64/kernel-image b/debian/installer/modules/ia64/kernel-image similarity index 100% rename from debian/installer/ia64/modules/ia64/kernel-image rename to debian/installer/modules/ia64/kernel-image diff --git a/debian/installer/ia64/modules/ia64/loop-modules b/debian/installer/modules/ia64/loop-modules similarity index 100% rename from debian/installer/ia64/modules/ia64/loop-modules rename to debian/installer/modules/ia64/loop-modules diff --git a/debian/installer/ia64/modules/ia64/md-modules b/debian/installer/modules/ia64/md-modules similarity index 100% rename from debian/installer/ia64/modules/ia64/md-modules rename to debian/installer/modules/ia64/md-modules diff --git a/debian/installer/ia64/modules/ia64/mouse-modules b/debian/installer/modules/ia64/mouse-modules similarity index 100% rename from debian/installer/ia64/modules/ia64/mouse-modules rename to debian/installer/modules/ia64/mouse-modules diff --git a/debian/installer/ia64/modules/ia64/multipath-modules b/debian/installer/modules/ia64/multipath-modules similarity index 100% rename from debian/installer/ia64/modules/ia64/multipath-modules rename to debian/installer/modules/ia64/multipath-modules diff --git a/debian/installer/ia64/modules/ia64/nbd-modules b/debian/installer/modules/ia64/nbd-modules similarity index 100% rename from debian/installer/ia64/modules/ia64/nbd-modules rename to debian/installer/modules/ia64/nbd-modules diff --git a/debian/installer/ia64/modules/ia64/nic-modules b/debian/installer/modules/ia64/nic-modules similarity index 100% rename from debian/installer/ia64/modules/ia64/nic-modules rename to debian/installer/modules/ia64/nic-modules diff --git a/debian/installer/ia64/modules/ia64/nic-shared-modules b/debian/installer/modules/ia64/nic-shared-modules similarity index 100% rename from debian/installer/ia64/modules/ia64/nic-shared-modules rename to debian/installer/modules/ia64/nic-shared-modules diff --git a/debian/installer/ia64/modules/ia64/nic-usb-modules b/debian/installer/modules/ia64/nic-usb-modules similarity index 100% rename from debian/installer/ia64/modules/ia64/nic-usb-modules rename to debian/installer/modules/ia64/nic-usb-modules diff --git a/debian/installer/ia64/modules/ia64/ntfs-modules b/debian/installer/modules/ia64/ntfs-modules similarity index 100% rename from debian/installer/ia64/modules/ia64/ntfs-modules rename to debian/installer/modules/ia64/ntfs-modules diff --git a/debian/installer/ia64/modules/ia64/pata-modules b/debian/installer/modules/ia64/pata-modules similarity index 100% rename from debian/installer/ia64/modules/ia64/pata-modules rename to debian/installer/modules/ia64/pata-modules diff --git a/debian/installer/ia64/modules/ia64/pcmcia-modules b/debian/installer/modules/ia64/pcmcia-modules similarity index 100% rename from debian/installer/ia64/modules/ia64/pcmcia-modules rename to debian/installer/modules/ia64/pcmcia-modules diff --git a/debian/installer/ia64/modules/ia64/ppp-modules b/debian/installer/modules/ia64/ppp-modules similarity index 100% rename from debian/installer/ia64/modules/ia64/ppp-modules rename to debian/installer/modules/ia64/ppp-modules diff --git a/debian/installer/ia64/modules/ia64/sata-modules b/debian/installer/modules/ia64/sata-modules similarity index 100% rename from debian/installer/ia64/modules/ia64/sata-modules rename to debian/installer/modules/ia64/sata-modules diff --git a/debian/installer/ia64/modules/ia64/scsi-core-modules b/debian/installer/modules/ia64/scsi-core-modules similarity index 100% rename from debian/installer/ia64/modules/ia64/scsi-core-modules rename to debian/installer/modules/ia64/scsi-core-modules diff --git a/debian/installer/ia64/modules/ia64/scsi-modules b/debian/installer/modules/ia64/scsi-modules similarity index 100% rename from debian/installer/ia64/modules/ia64/scsi-modules rename to debian/installer/modules/ia64/scsi-modules diff --git a/debian/installer/ia64/modules/ia64/serial-modules b/debian/installer/modules/ia64/serial-modules similarity index 100% rename from debian/installer/ia64/modules/ia64/serial-modules rename to debian/installer/modules/ia64/serial-modules diff --git a/debian/installer/ia64/modules/ia64/sn-modules b/debian/installer/modules/ia64/sn-modules similarity index 100% rename from debian/installer/ia64/modules/ia64/sn-modules rename to debian/installer/modules/ia64/sn-modules diff --git a/debian/installer/ia64/modules/ia64/squashfs-modules b/debian/installer/modules/ia64/squashfs-modules similarity index 100% rename from debian/installer/ia64/modules/ia64/squashfs-modules rename to debian/installer/modules/ia64/squashfs-modules diff --git a/debian/installer/ia64/modules/ia64/udf-modules b/debian/installer/modules/ia64/udf-modules similarity index 100% rename from debian/installer/ia64/modules/ia64/udf-modules rename to debian/installer/modules/ia64/udf-modules diff --git a/debian/installer/ia64/modules/ia64/uinput-modules b/debian/installer/modules/ia64/uinput-modules similarity index 100% rename from debian/installer/ia64/modules/ia64/uinput-modules rename to debian/installer/modules/ia64/uinput-modules diff --git a/debian/installer/ia64/modules/ia64/usb-modules b/debian/installer/modules/ia64/usb-modules similarity index 100% rename from debian/installer/ia64/modules/ia64/usb-modules rename to debian/installer/modules/ia64/usb-modules diff --git a/debian/installer/ia64/modules/ia64/usb-storage-modules b/debian/installer/modules/ia64/usb-storage-modules similarity index 100% rename from debian/installer/ia64/modules/ia64/usb-storage-modules rename to debian/installer/modules/ia64/usb-storage-modules diff --git a/debian/installer/ia64/modules/ia64/xfs-modules b/debian/installer/modules/ia64/xfs-modules similarity index 100% rename from debian/installer/ia64/modules/ia64/xfs-modules rename to debian/installer/modules/ia64/xfs-modules diff --git a/debian/installer/m68k/modules/m68k/affs-modules b/debian/installer/modules/m68k/affs-modules similarity index 100% rename from debian/installer/m68k/modules/m68k/affs-modules rename to debian/installer/modules/m68k/affs-modules diff --git a/debian/installer/m68k/modules/m68k/ata-modules b/debian/installer/modules/m68k/ata-modules similarity index 100% rename from debian/installer/m68k/modules/m68k/ata-modules rename to debian/installer/modules/m68k/ata-modules diff --git a/debian/installer/m68k/modules/m68k/btrfs-modules b/debian/installer/modules/m68k/btrfs-modules similarity index 100% rename from debian/installer/m68k/modules/m68k/btrfs-modules rename to debian/installer/modules/m68k/btrfs-modules diff --git a/debian/installer/m68k/modules/m68k/cdrom-core-modules b/debian/installer/modules/m68k/cdrom-core-modules similarity index 100% rename from debian/installer/m68k/modules/m68k/cdrom-core-modules rename to debian/installer/modules/m68k/cdrom-core-modules diff --git a/debian/installer/m68k/modules/m68k/compress-modules b/debian/installer/modules/m68k/compress-modules similarity index 100% rename from debian/installer/m68k/modules/m68k/compress-modules rename to debian/installer/modules/m68k/compress-modules diff --git a/debian/installer/m68k/modules/m68k/crc-modules b/debian/installer/modules/m68k/crc-modules similarity index 100% rename from debian/installer/m68k/modules/m68k/crc-modules rename to debian/installer/modules/m68k/crc-modules diff --git a/debian/installer/m68k/modules/m68k/crypto-modules b/debian/installer/modules/m68k/crypto-modules similarity index 100% rename from debian/installer/m68k/modules/m68k/crypto-modules rename to debian/installer/modules/m68k/crypto-modules diff --git a/debian/installer/m68k/modules/m68k/ext4-modules b/debian/installer/modules/m68k/ext4-modules similarity index 100% rename from debian/installer/m68k/modules/m68k/ext4-modules rename to debian/installer/modules/m68k/ext4-modules diff --git a/debian/installer/m68k/modules/m68k/fat-modules b/debian/installer/modules/m68k/fat-modules similarity index 100% rename from debian/installer/m68k/modules/m68k/fat-modules rename to debian/installer/modules/m68k/fat-modules diff --git a/debian/installer/m68k/modules/m68k/fuse-modules b/debian/installer/modules/m68k/fuse-modules similarity index 100% rename from debian/installer/m68k/modules/m68k/fuse-modules rename to debian/installer/modules/m68k/fuse-modules diff --git a/debian/installer/m68k/modules/m68k/hfs-modules b/debian/installer/modules/m68k/hfs-modules similarity index 100% rename from debian/installer/m68k/modules/m68k/hfs-modules rename to debian/installer/modules/m68k/hfs-modules diff --git a/debian/installer/m68k/modules/m68k/ide-core-modules b/debian/installer/modules/m68k/ide-core-modules similarity index 100% rename from debian/installer/m68k/modules/m68k/ide-core-modules rename to debian/installer/modules/m68k/ide-core-modules diff --git a/debian/installer/m68k/modules/m68k/ide-modules b/debian/installer/modules/m68k/ide-modules similarity index 100% rename from debian/installer/m68k/modules/m68k/ide-modules rename to debian/installer/modules/m68k/ide-modules diff --git a/debian/installer/m68k/modules/m68k/isofs-modules b/debian/installer/modules/m68k/isofs-modules similarity index 100% rename from debian/installer/m68k/modules/m68k/isofs-modules rename to debian/installer/modules/m68k/isofs-modules diff --git a/debian/installer/m68k/modules/m68k/kernel-image b/debian/installer/modules/m68k/kernel-image similarity index 100% rename from debian/installer/m68k/modules/m68k/kernel-image rename to debian/installer/modules/m68k/kernel-image diff --git a/debian/installer/m68k/modules/m68k/loop-modules b/debian/installer/modules/m68k/loop-modules similarity index 100% rename from debian/installer/m68k/modules/m68k/loop-modules rename to debian/installer/modules/m68k/loop-modules diff --git a/debian/installer/m68k/modules/m68k/md-modules b/debian/installer/modules/m68k/md-modules similarity index 100% rename from debian/installer/m68k/modules/m68k/md-modules rename to debian/installer/modules/m68k/md-modules diff --git a/debian/installer/m68k/modules/m68k/nbd-modules b/debian/installer/modules/m68k/nbd-modules similarity index 100% rename from debian/installer/m68k/modules/m68k/nbd-modules rename to debian/installer/modules/m68k/nbd-modules diff --git a/debian/installer/m68k/modules/m68k/nic-modules b/debian/installer/modules/m68k/nic-modules similarity index 100% rename from debian/installer/m68k/modules/m68k/nic-modules rename to debian/installer/modules/m68k/nic-modules diff --git a/debian/installer/m68k/modules/m68k/nic-shared-modules b/debian/installer/modules/m68k/nic-shared-modules similarity index 100% rename from debian/installer/m68k/modules/m68k/nic-shared-modules rename to debian/installer/modules/m68k/nic-shared-modules diff --git a/debian/installer/m68k/modules/m68k/pata-modules b/debian/installer/modules/m68k/pata-modules similarity index 100% rename from debian/installer/m68k/modules/m68k/pata-modules rename to debian/installer/modules/m68k/pata-modules diff --git a/debian/installer/m68k/modules/m68k/ppp-modules b/debian/installer/modules/m68k/ppp-modules similarity index 100% rename from debian/installer/m68k/modules/m68k/ppp-modules rename to debian/installer/modules/m68k/ppp-modules diff --git a/debian/installer/m68k/modules/m68k/scsi-core-modules b/debian/installer/modules/m68k/scsi-core-modules similarity index 100% rename from debian/installer/m68k/modules/m68k/scsi-core-modules rename to debian/installer/modules/m68k/scsi-core-modules diff --git a/debian/installer/m68k/modules/m68k/scsi-modules b/debian/installer/modules/m68k/scsi-modules similarity index 100% rename from debian/installer/m68k/modules/m68k/scsi-modules rename to debian/installer/modules/m68k/scsi-modules diff --git a/debian/installer/m68k/modules/m68k/squashfs-modules b/debian/installer/modules/m68k/squashfs-modules similarity index 100% rename from debian/installer/m68k/modules/m68k/squashfs-modules rename to debian/installer/modules/m68k/squashfs-modules diff --git a/debian/installer/m68k/modules/m68k/udf-modules b/debian/installer/modules/m68k/udf-modules similarity index 100% rename from debian/installer/m68k/modules/m68k/udf-modules rename to debian/installer/modules/m68k/udf-modules diff --git a/debian/installer/m68k/modules/m68k/zlib-modules b/debian/installer/modules/m68k/zlib-modules similarity index 100% rename from debian/installer/m68k/modules/m68k/zlib-modules rename to debian/installer/modules/m68k/zlib-modules diff --git a/debian/installer/mips/modules/mips-4kc-malta/affs-modules b/debian/installer/modules/mips-4kc-malta/affs-modules similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/affs-modules rename to debian/installer/modules/mips-4kc-malta/affs-modules diff --git a/debian/installer/mips/modules/mips-4kc-malta/ata-modules b/debian/installer/modules/mips-4kc-malta/ata-modules similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/ata-modules rename to debian/installer/modules/mips-4kc-malta/ata-modules diff --git a/debian/installer/mips/modules/mips-4kc-malta/btrfs-modules b/debian/installer/modules/mips-4kc-malta/btrfs-modules similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/btrfs-modules rename to debian/installer/modules/mips-4kc-malta/btrfs-modules diff --git a/debian/installer/mips/modules/mips-4kc-malta/cdrom-core-modules b/debian/installer/modules/mips-4kc-malta/cdrom-core-modules similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/cdrom-core-modules rename to debian/installer/modules/mips-4kc-malta/cdrom-core-modules diff --git a/debian/installer/mips/modules/mips-4kc-malta/compress-modules b/debian/installer/modules/mips-4kc-malta/compress-modules similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/compress-modules rename to debian/installer/modules/mips-4kc-malta/compress-modules diff --git a/debian/installer/mips/modules/mips-4kc-malta/crc-modules b/debian/installer/modules/mips-4kc-malta/crc-modules similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/crc-modules rename to debian/installer/modules/mips-4kc-malta/crc-modules diff --git a/debian/installer/mips/modules/mips-4kc-malta/crypto-dm-modules b/debian/installer/modules/mips-4kc-malta/crypto-dm-modules similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/crypto-dm-modules rename to debian/installer/modules/mips-4kc-malta/crypto-dm-modules diff --git a/debian/installer/mips/modules/mips-4kc-malta/crypto-modules b/debian/installer/modules/mips-4kc-malta/crypto-modules similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/crypto-modules rename to debian/installer/modules/mips-4kc-malta/crypto-modules diff --git a/debian/installer/mips/modules/mips-4kc-malta/event-modules b/debian/installer/modules/mips-4kc-malta/event-modules similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/event-modules rename to debian/installer/modules/mips-4kc-malta/event-modules diff --git a/debian/installer/mips/modules/mips-4kc-malta/ext4-modules b/debian/installer/modules/mips-4kc-malta/ext4-modules similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/ext4-modules rename to debian/installer/modules/mips-4kc-malta/ext4-modules diff --git a/debian/installer/mips/modules/mips-4kc-malta/fat-modules b/debian/installer/modules/mips-4kc-malta/fat-modules similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/fat-modules rename to debian/installer/modules/mips-4kc-malta/fat-modules diff --git a/debian/installer/mips/modules/mips-4kc-malta/fuse-modules b/debian/installer/modules/mips-4kc-malta/fuse-modules similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/fuse-modules rename to debian/installer/modules/mips-4kc-malta/fuse-modules diff --git a/debian/installer/mips/modules/mips-4kc-malta/hfs-modules b/debian/installer/modules/mips-4kc-malta/hfs-modules similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/hfs-modules rename to debian/installer/modules/mips-4kc-malta/hfs-modules diff --git a/debian/installer/mips/modules/mips-4kc-malta/i2c-modules b/debian/installer/modules/mips-4kc-malta/i2c-modules similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/i2c-modules rename to debian/installer/modules/mips-4kc-malta/i2c-modules diff --git a/debian/installer/mips/modules/mips-4kc-malta/input-modules b/debian/installer/modules/mips-4kc-malta/input-modules similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/input-modules rename to debian/installer/modules/mips-4kc-malta/input-modules diff --git a/debian/installer/mips/modules/mips-4kc-malta/isofs-modules b/debian/installer/modules/mips-4kc-malta/isofs-modules similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/isofs-modules rename to debian/installer/modules/mips-4kc-malta/isofs-modules diff --git a/debian/installer/mips/modules/mips-4kc-malta/jfs-modules b/debian/installer/modules/mips-4kc-malta/jfs-modules similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/jfs-modules rename to debian/installer/modules/mips-4kc-malta/jfs-modules diff --git a/debian/installer/mips/modules/mips-4kc-malta/kernel-image b/debian/installer/modules/mips-4kc-malta/kernel-image similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/kernel-image rename to debian/installer/modules/mips-4kc-malta/kernel-image diff --git a/debian/installer/mips/modules/mips-4kc-malta/loop-modules b/debian/installer/modules/mips-4kc-malta/loop-modules similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/loop-modules rename to debian/installer/modules/mips-4kc-malta/loop-modules diff --git a/debian/installer/mips/modules/mips-4kc-malta/md-modules b/debian/installer/modules/mips-4kc-malta/md-modules similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/md-modules rename to debian/installer/modules/mips-4kc-malta/md-modules diff --git a/debian/installer/mips/modules/mips-4kc-malta/minix-modules b/debian/installer/modules/mips-4kc-malta/minix-modules similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/minix-modules rename to debian/installer/modules/mips-4kc-malta/minix-modules diff --git a/debian/installer/mips/modules/mips-4kc-malta/mmc-core-modules b/debian/installer/modules/mips-4kc-malta/mmc-core-modules similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/mmc-core-modules rename to debian/installer/modules/mips-4kc-malta/mmc-core-modules diff --git a/debian/installer/mips/modules/mips-4kc-malta/mmc-modules b/debian/installer/modules/mips-4kc-malta/mmc-modules similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/mmc-modules rename to debian/installer/modules/mips-4kc-malta/mmc-modules diff --git a/debian/installer/mips/modules/mips-4kc-malta/mouse-modules b/debian/installer/modules/mips-4kc-malta/mouse-modules similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/mouse-modules rename to debian/installer/modules/mips-4kc-malta/mouse-modules diff --git a/debian/installer/mips/modules/mips-4kc-malta/multipath-modules b/debian/installer/modules/mips-4kc-malta/multipath-modules similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/multipath-modules rename to debian/installer/modules/mips-4kc-malta/multipath-modules diff --git a/debian/installer/mips/modules/mips-4kc-malta/nbd-modules b/debian/installer/modules/mips-4kc-malta/nbd-modules similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/nbd-modules rename to debian/installer/modules/mips-4kc-malta/nbd-modules diff --git a/debian/installer/mips/modules/mips-4kc-malta/nic-modules b/debian/installer/modules/mips-4kc-malta/nic-modules similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/nic-modules rename to debian/installer/modules/mips-4kc-malta/nic-modules diff --git a/debian/installer/mips/modules/mips-4kc-malta/nic-shared-modules b/debian/installer/modules/mips-4kc-malta/nic-shared-modules similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/nic-shared-modules rename to debian/installer/modules/mips-4kc-malta/nic-shared-modules diff --git a/debian/installer/mips/modules/mips-4kc-malta/nic-usb-modules b/debian/installer/modules/mips-4kc-malta/nic-usb-modules similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/nic-usb-modules rename to debian/installer/modules/mips-4kc-malta/nic-usb-modules diff --git a/debian/installer/mips/modules/mips-4kc-malta/nic-wireless-modules b/debian/installer/modules/mips-4kc-malta/nic-wireless-modules similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/nic-wireless-modules rename to debian/installer/modules/mips-4kc-malta/nic-wireless-modules diff --git a/debian/installer/mips/modules/mips-4kc-malta/ntfs-modules b/debian/installer/modules/mips-4kc-malta/ntfs-modules similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/ntfs-modules rename to debian/installer/modules/mips-4kc-malta/ntfs-modules diff --git a/debian/installer/mips/modules/mips-4kc-malta/pata-modules b/debian/installer/modules/mips-4kc-malta/pata-modules similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/pata-modules rename to debian/installer/modules/mips-4kc-malta/pata-modules diff --git a/debian/installer/mips/modules/mips-4kc-malta/ppp-modules b/debian/installer/modules/mips-4kc-malta/ppp-modules similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/ppp-modules rename to debian/installer/modules/mips-4kc-malta/ppp-modules diff --git a/debian/installer/mips/modules/mips-4kc-malta/qnx4-modules b/debian/installer/modules/mips-4kc-malta/qnx4-modules similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/qnx4-modules rename to debian/installer/modules/mips-4kc-malta/qnx4-modules diff --git a/debian/installer/mips/modules/mips-4kc-malta/sata-modules b/debian/installer/modules/mips-4kc-malta/sata-modules similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/sata-modules rename to debian/installer/modules/mips-4kc-malta/sata-modules diff --git a/debian/installer/mips/modules/mips-4kc-malta/scsi-core-modules b/debian/installer/modules/mips-4kc-malta/scsi-core-modules similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/scsi-core-modules rename to debian/installer/modules/mips-4kc-malta/scsi-core-modules diff --git a/debian/installer/mips/modules/mips-4kc-malta/scsi-modules b/debian/installer/modules/mips-4kc-malta/scsi-modules similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/scsi-modules rename to debian/installer/modules/mips-4kc-malta/scsi-modules diff --git a/debian/installer/mips/modules/mips-4kc-malta/sound-modules b/debian/installer/modules/mips-4kc-malta/sound-modules similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/sound-modules rename to debian/installer/modules/mips-4kc-malta/sound-modules diff --git a/debian/installer/mips/modules/mips-4kc-malta/squashfs-modules b/debian/installer/modules/mips-4kc-malta/squashfs-modules similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/squashfs-modules rename to debian/installer/modules/mips-4kc-malta/squashfs-modules diff --git a/debian/installer/mips/modules/mips-4kc-malta/udf-modules b/debian/installer/modules/mips-4kc-malta/udf-modules similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/udf-modules rename to debian/installer/modules/mips-4kc-malta/udf-modules diff --git a/debian/installer/mips/modules/mips-4kc-malta/usb-modules b/debian/installer/modules/mips-4kc-malta/usb-modules similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/usb-modules rename to debian/installer/modules/mips-4kc-malta/usb-modules diff --git a/debian/installer/mips/modules/mips-4kc-malta/usb-serial-modules b/debian/installer/modules/mips-4kc-malta/usb-serial-modules similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/usb-serial-modules rename to debian/installer/modules/mips-4kc-malta/usb-serial-modules diff --git a/debian/installer/mips/modules/mips-4kc-malta/usb-storage-modules b/debian/installer/modules/mips-4kc-malta/usb-storage-modules similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/usb-storage-modules rename to debian/installer/modules/mips-4kc-malta/usb-storage-modules diff --git a/debian/installer/mips/modules/mips-4kc-malta/virtio-modules b/debian/installer/modules/mips-4kc-malta/virtio-modules similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/virtio-modules rename to debian/installer/modules/mips-4kc-malta/virtio-modules diff --git a/debian/installer/mips/modules/mips-4kc-malta/xfs-modules b/debian/installer/modules/mips-4kc-malta/xfs-modules similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/xfs-modules rename to debian/installer/modules/mips-4kc-malta/xfs-modules diff --git a/debian/installer/mips/modules/mips-4kc-malta/zlib-modules b/debian/installer/modules/mips-4kc-malta/zlib-modules similarity index 100% rename from debian/installer/mips/modules/mips-4kc-malta/zlib-modules rename to debian/installer/modules/mips-4kc-malta/zlib-modules diff --git a/debian/installer/mips/modules/mips-octeon/affs-modules b/debian/installer/modules/mips-octeon/affs-modules similarity index 100% rename from debian/installer/mips/modules/mips-octeon/affs-modules rename to debian/installer/modules/mips-octeon/affs-modules diff --git a/debian/installer/mips/modules/mips-octeon/btrfs-modules b/debian/installer/modules/mips-octeon/btrfs-modules similarity index 100% rename from debian/installer/mips/modules/mips-octeon/btrfs-modules rename to debian/installer/modules/mips-octeon/btrfs-modules diff --git a/debian/installer/mips/modules/mips-octeon/cdrom-core-modules b/debian/installer/modules/mips-octeon/cdrom-core-modules similarity index 100% rename from debian/installer/mips/modules/mips-octeon/cdrom-core-modules rename to debian/installer/modules/mips-octeon/cdrom-core-modules diff --git a/debian/installer/mips/modules/mips-octeon/compress-modules b/debian/installer/modules/mips-octeon/compress-modules similarity index 100% rename from debian/installer/mips/modules/mips-octeon/compress-modules rename to debian/installer/modules/mips-octeon/compress-modules diff --git a/debian/installer/mips/modules/mips-octeon/crc-modules b/debian/installer/modules/mips-octeon/crc-modules similarity index 100% rename from debian/installer/mips/modules/mips-octeon/crc-modules rename to debian/installer/modules/mips-octeon/crc-modules diff --git a/debian/installer/mips/modules/mips-octeon/crypto-dm-modules b/debian/installer/modules/mips-octeon/crypto-dm-modules similarity index 100% rename from debian/installer/mips/modules/mips-octeon/crypto-dm-modules rename to debian/installer/modules/mips-octeon/crypto-dm-modules diff --git a/debian/installer/mips/modules/mips-octeon/crypto-modules b/debian/installer/modules/mips-octeon/crypto-modules similarity index 100% rename from debian/installer/mips/modules/mips-octeon/crypto-modules rename to debian/installer/modules/mips-octeon/crypto-modules diff --git a/debian/installer/mips/modules/mips-octeon/event-modules b/debian/installer/modules/mips-octeon/event-modules similarity index 100% rename from debian/installer/mips/modules/mips-octeon/event-modules rename to debian/installer/modules/mips-octeon/event-modules diff --git a/debian/installer/mips/modules/mips-octeon/ext4-modules b/debian/installer/modules/mips-octeon/ext4-modules similarity index 100% rename from debian/installer/mips/modules/mips-octeon/ext4-modules rename to debian/installer/modules/mips-octeon/ext4-modules diff --git a/debian/installer/mips/modules/mips-octeon/fat-modules b/debian/installer/modules/mips-octeon/fat-modules similarity index 100% rename from debian/installer/mips/modules/mips-octeon/fat-modules rename to debian/installer/modules/mips-octeon/fat-modules diff --git a/debian/installer/mips/modules/mips-octeon/fuse-modules b/debian/installer/modules/mips-octeon/fuse-modules similarity index 100% rename from debian/installer/mips/modules/mips-octeon/fuse-modules rename to debian/installer/modules/mips-octeon/fuse-modules diff --git a/debian/installer/mips/modules/mips-octeon/hfs-modules b/debian/installer/modules/mips-octeon/hfs-modules similarity index 100% rename from debian/installer/mips/modules/mips-octeon/hfs-modules rename to debian/installer/modules/mips-octeon/hfs-modules diff --git a/debian/installer/mips/modules/mips-octeon/input-modules b/debian/installer/modules/mips-octeon/input-modules similarity index 100% rename from debian/installer/mips/modules/mips-octeon/input-modules rename to debian/installer/modules/mips-octeon/input-modules diff --git a/debian/installer/mips/modules/mips-octeon/isofs-modules b/debian/installer/modules/mips-octeon/isofs-modules similarity index 100% rename from debian/installer/mips/modules/mips-octeon/isofs-modules rename to debian/installer/modules/mips-octeon/isofs-modules diff --git a/debian/installer/mips/modules/mips-octeon/jfs-modules b/debian/installer/modules/mips-octeon/jfs-modules similarity index 100% rename from debian/installer/mips/modules/mips-octeon/jfs-modules rename to debian/installer/modules/mips-octeon/jfs-modules diff --git a/debian/installer/mips/modules/mips-octeon/kernel-image b/debian/installer/modules/mips-octeon/kernel-image similarity index 100% rename from debian/installer/mips/modules/mips-octeon/kernel-image rename to debian/installer/modules/mips-octeon/kernel-image diff --git a/debian/installer/mips/modules/mips-octeon/loop-modules b/debian/installer/modules/mips-octeon/loop-modules similarity index 100% rename from debian/installer/mips/modules/mips-octeon/loop-modules rename to debian/installer/modules/mips-octeon/loop-modules diff --git a/debian/installer/mips/modules/mips-octeon/md-modules b/debian/installer/modules/mips-octeon/md-modules similarity index 100% rename from debian/installer/mips/modules/mips-octeon/md-modules rename to debian/installer/modules/mips-octeon/md-modules diff --git a/debian/installer/mips/modules/mips-octeon/minix-modules b/debian/installer/modules/mips-octeon/minix-modules similarity index 100% rename from debian/installer/mips/modules/mips-octeon/minix-modules rename to debian/installer/modules/mips-octeon/minix-modules diff --git a/debian/installer/mips/modules/mips-octeon/multipath-modules b/debian/installer/modules/mips-octeon/multipath-modules similarity index 100% rename from debian/installer/mips/modules/mips-octeon/multipath-modules rename to debian/installer/modules/mips-octeon/multipath-modules diff --git a/debian/installer/mips/modules/mips-octeon/nbd-modules b/debian/installer/modules/mips-octeon/nbd-modules similarity index 100% rename from debian/installer/mips/modules/mips-octeon/nbd-modules rename to debian/installer/modules/mips-octeon/nbd-modules diff --git a/debian/installer/mips/modules/mips-octeon/nic-modules b/debian/installer/modules/mips-octeon/nic-modules similarity index 100% rename from debian/installer/mips/modules/mips-octeon/nic-modules rename to debian/installer/modules/mips-octeon/nic-modules diff --git a/debian/installer/mips/modules/mips-octeon/nic-shared-modules b/debian/installer/modules/mips-octeon/nic-shared-modules similarity index 100% rename from debian/installer/mips/modules/mips-octeon/nic-shared-modules rename to debian/installer/modules/mips-octeon/nic-shared-modules diff --git a/debian/installer/mips/modules/mips-octeon/nic-usb-modules b/debian/installer/modules/mips-octeon/nic-usb-modules similarity index 100% rename from debian/installer/mips/modules/mips-octeon/nic-usb-modules rename to debian/installer/modules/mips-octeon/nic-usb-modules diff --git a/debian/installer/mips/modules/mips-octeon/nic-wireless-modules b/debian/installer/modules/mips-octeon/nic-wireless-modules similarity index 100% rename from debian/installer/mips/modules/mips-octeon/nic-wireless-modules rename to debian/installer/modules/mips-octeon/nic-wireless-modules diff --git a/debian/installer/mips/modules/mips-octeon/ntfs-modules b/debian/installer/modules/mips-octeon/ntfs-modules similarity index 100% rename from debian/installer/mips/modules/mips-octeon/ntfs-modules rename to debian/installer/modules/mips-octeon/ntfs-modules diff --git a/debian/installer/mips/modules/mips-octeon/pata-modules b/debian/installer/modules/mips-octeon/pata-modules similarity index 100% rename from debian/installer/mips/modules/mips-octeon/pata-modules rename to debian/installer/modules/mips-octeon/pata-modules diff --git a/debian/installer/mips/modules/mips-octeon/ppp-modules b/debian/installer/modules/mips-octeon/ppp-modules similarity index 100% rename from debian/installer/mips/modules/mips-octeon/ppp-modules rename to debian/installer/modules/mips-octeon/ppp-modules diff --git a/debian/installer/mips/modules/mips-octeon/qnx4-modules b/debian/installer/modules/mips-octeon/qnx4-modules similarity index 100% rename from debian/installer/mips/modules/mips-octeon/qnx4-modules rename to debian/installer/modules/mips-octeon/qnx4-modules diff --git a/debian/installer/mips/modules/mips-octeon/rtc-modules b/debian/installer/modules/mips-octeon/rtc-modules similarity index 100% rename from debian/installer/mips/modules/mips-octeon/rtc-modules rename to debian/installer/modules/mips-octeon/rtc-modules diff --git a/debian/installer/mips/modules/mips-octeon/sata-modules b/debian/installer/modules/mips-octeon/sata-modules similarity index 100% rename from debian/installer/mips/modules/mips-octeon/sata-modules rename to debian/installer/modules/mips-octeon/sata-modules diff --git a/debian/installer/mips/modules/mips-octeon/scsi-core-modules b/debian/installer/modules/mips-octeon/scsi-core-modules similarity index 100% rename from debian/installer/mips/modules/mips-octeon/scsi-core-modules rename to debian/installer/modules/mips-octeon/scsi-core-modules diff --git a/debian/installer/mips/modules/mips-octeon/scsi-modules b/debian/installer/modules/mips-octeon/scsi-modules similarity index 100% rename from debian/installer/mips/modules/mips-octeon/scsi-modules rename to debian/installer/modules/mips-octeon/scsi-modules diff --git a/debian/installer/mips/modules/mips-octeon/sound-modules b/debian/installer/modules/mips-octeon/sound-modules similarity index 100% rename from debian/installer/mips/modules/mips-octeon/sound-modules rename to debian/installer/modules/mips-octeon/sound-modules diff --git a/debian/installer/mips/modules/mips-octeon/squashfs-modules b/debian/installer/modules/mips-octeon/squashfs-modules similarity index 100% rename from debian/installer/mips/modules/mips-octeon/squashfs-modules rename to debian/installer/modules/mips-octeon/squashfs-modules diff --git a/debian/installer/mips/modules/mips-octeon/udf-modules b/debian/installer/modules/mips-octeon/udf-modules similarity index 100% rename from debian/installer/mips/modules/mips-octeon/udf-modules rename to debian/installer/modules/mips-octeon/udf-modules diff --git a/debian/installer/mips/modules/mips-octeon/usb-modules b/debian/installer/modules/mips-octeon/usb-modules similarity index 100% rename from debian/installer/mips/modules/mips-octeon/usb-modules rename to debian/installer/modules/mips-octeon/usb-modules diff --git a/debian/installer/mips/modules/mips-octeon/usb-serial-modules b/debian/installer/modules/mips-octeon/usb-serial-modules similarity index 100% rename from debian/installer/mips/modules/mips-octeon/usb-serial-modules rename to debian/installer/modules/mips-octeon/usb-serial-modules diff --git a/debian/installer/mips/modules/mips-octeon/usb-storage-modules b/debian/installer/modules/mips-octeon/usb-storage-modules similarity index 100% rename from debian/installer/mips/modules/mips-octeon/usb-storage-modules rename to debian/installer/modules/mips-octeon/usb-storage-modules diff --git a/debian/installer/mips/modules/mips-octeon/virtio-modules b/debian/installer/modules/mips-octeon/virtio-modules similarity index 100% rename from debian/installer/mips/modules/mips-octeon/virtio-modules rename to debian/installer/modules/mips-octeon/virtio-modules diff --git a/debian/installer/mips/modules/mips-octeon/xfs-modules b/debian/installer/modules/mips-octeon/xfs-modules similarity index 100% rename from debian/installer/mips/modules/mips-octeon/xfs-modules rename to debian/installer/modules/mips-octeon/xfs-modules diff --git a/debian/installer/mips/modules/mips-octeon/zlib-modules b/debian/installer/modules/mips-octeon/zlib-modules similarity index 100% rename from debian/installer/mips/modules/mips-octeon/zlib-modules rename to debian/installer/modules/mips-octeon/zlib-modules diff --git a/debian/installer/mips/modules/mips/btrfs-modules b/debian/installer/modules/mips/btrfs-modules similarity index 100% rename from debian/installer/mips/modules/mips/btrfs-modules rename to debian/installer/modules/mips/btrfs-modules diff --git a/debian/installer/mips/modules/mips/compress-modules b/debian/installer/modules/mips/compress-modules similarity index 100% rename from debian/installer/mips/modules/mips/compress-modules rename to debian/installer/modules/mips/compress-modules diff --git a/debian/installer/mips/modules/mips/crc-modules b/debian/installer/modules/mips/crc-modules similarity index 100% rename from debian/installer/mips/modules/mips/crc-modules rename to debian/installer/modules/mips/crc-modules diff --git a/debian/installer/mips/modules/mips/crypto-dm-modules b/debian/installer/modules/mips/crypto-dm-modules similarity index 100% rename from debian/installer/mips/modules/mips/crypto-dm-modules rename to debian/installer/modules/mips/crypto-dm-modules diff --git a/debian/installer/mips/modules/mips/crypto-modules b/debian/installer/modules/mips/crypto-modules similarity index 100% rename from debian/installer/mips/modules/mips/crypto-modules rename to debian/installer/modules/mips/crypto-modules diff --git a/debian/installer/mips/modules/mips/ext4-modules b/debian/installer/modules/mips/ext4-modules similarity index 100% rename from debian/installer/mips/modules/mips/ext4-modules rename to debian/installer/modules/mips/ext4-modules diff --git a/debian/installer/mips/modules/mips/fuse-modules b/debian/installer/modules/mips/fuse-modules similarity index 100% rename from debian/installer/mips/modules/mips/fuse-modules rename to debian/installer/modules/mips/fuse-modules diff --git a/debian/installer/mips/modules/mips/isofs-modules b/debian/installer/modules/mips/isofs-modules similarity index 100% rename from debian/installer/mips/modules/mips/isofs-modules rename to debian/installer/modules/mips/isofs-modules diff --git a/debian/installer/mips/modules/mips/jfs-modules b/debian/installer/modules/mips/jfs-modules similarity index 100% rename from debian/installer/mips/modules/mips/jfs-modules rename to debian/installer/modules/mips/jfs-modules diff --git a/debian/installer/mips/modules/mips/kernel-image b/debian/installer/modules/mips/kernel-image similarity index 100% rename from debian/installer/mips/modules/mips/kernel-image rename to debian/installer/modules/mips/kernel-image diff --git a/debian/installer/mips/modules/mips/loop-modules b/debian/installer/modules/mips/loop-modules similarity index 100% rename from debian/installer/mips/modules/mips/loop-modules rename to debian/installer/modules/mips/loop-modules diff --git a/debian/installer/mips/modules/mips/md-modules b/debian/installer/modules/mips/md-modules similarity index 100% rename from debian/installer/mips/modules/mips/md-modules rename to debian/installer/modules/mips/md-modules diff --git a/debian/installer/mips/modules/mips/multipath-modules b/debian/installer/modules/mips/multipath-modules similarity index 100% rename from debian/installer/mips/modules/mips/multipath-modules rename to debian/installer/modules/mips/multipath-modules diff --git a/debian/installer/mips/modules/mips/nbd-modules b/debian/installer/modules/mips/nbd-modules similarity index 100% rename from debian/installer/mips/modules/mips/nbd-modules rename to debian/installer/modules/mips/nbd-modules diff --git a/debian/installer/mips/modules/mips/nic-shared-modules b/debian/installer/modules/mips/nic-shared-modules similarity index 100% rename from debian/installer/mips/modules/mips/nic-shared-modules rename to debian/installer/modules/mips/nic-shared-modules diff --git a/debian/installer/mips/modules/mips/squashfs-modules b/debian/installer/modules/mips/squashfs-modules similarity index 100% rename from debian/installer/mips/modules/mips/squashfs-modules rename to debian/installer/modules/mips/squashfs-modules diff --git a/debian/installer/mips/modules/mips/udf-modules b/debian/installer/modules/mips/udf-modules similarity index 100% rename from debian/installer/mips/modules/mips/udf-modules rename to debian/installer/modules/mips/udf-modules diff --git a/debian/installer/mips/modules/mips/xfs-modules b/debian/installer/modules/mips/xfs-modules similarity index 100% rename from debian/installer/mips/modules/mips/xfs-modules rename to debian/installer/modules/mips/xfs-modules diff --git a/debian/installer/mips/modules/mips/zlib-modules b/debian/installer/modules/mips/zlib-modules similarity index 100% rename from debian/installer/mips/modules/mips/zlib-modules rename to debian/installer/modules/mips/zlib-modules diff --git a/debian/installer/modules/mips32r6 b/debian/installer/modules/mips32r6 new file mode 120000 index 000000000..af28acbd9 --- /dev/null +++ b/debian/installer/modules/mips32r6 @@ -0,0 +1 @@ +mips \ No newline at end of file diff --git a/debian/installer/modules/mips32r6el b/debian/installer/modules/mips32r6el new file mode 120000 index 000000000..af28acbd9 --- /dev/null +++ b/debian/installer/modules/mips32r6el @@ -0,0 +1 @@ +mips \ No newline at end of file diff --git a/debian/installer/modules/mips64 b/debian/installer/modules/mips64 new file mode 120000 index 000000000..af28acbd9 --- /dev/null +++ b/debian/installer/modules/mips64 @@ -0,0 +1 @@ +mips \ No newline at end of file diff --git a/debian/installer/modules/mips64-5kc-malta b/debian/installer/modules/mips64-5kc-malta new file mode 120000 index 000000000..6bae6ca28 --- /dev/null +++ b/debian/installer/modules/mips64-5kc-malta @@ -0,0 +1 @@ +mips-4kc-malta \ No newline at end of file diff --git a/debian/installer/modules/mips64-octeon b/debian/installer/modules/mips64-octeon new file mode 120000 index 000000000..47b1b81ab --- /dev/null +++ b/debian/installer/modules/mips64-octeon @@ -0,0 +1 @@ +mips-octeon \ No newline at end of file diff --git a/debian/installer/modules/mips64el-5kc-malta b/debian/installer/modules/mips64el-5kc-malta new file mode 120000 index 000000000..6bae6ca28 --- /dev/null +++ b/debian/installer/modules/mips64el-5kc-malta @@ -0,0 +1 @@ +mips-4kc-malta \ No newline at end of file diff --git a/debian/installer/modules/mips64el-loongson-3 b/debian/installer/modules/mips64el-loongson-3 new file mode 120000 index 000000000..409be8354 --- /dev/null +++ b/debian/installer/modules/mips64el-loongson-3 @@ -0,0 +1 @@ +mipsel-loongson-3 \ No newline at end of file diff --git a/debian/installer/modules/mips64el-octeon b/debian/installer/modules/mips64el-octeon new file mode 120000 index 000000000..47b1b81ab --- /dev/null +++ b/debian/installer/modules/mips64el-octeon @@ -0,0 +1 @@ +mips-octeon \ No newline at end of file diff --git a/debian/installer/modules/mips64r6 b/debian/installer/modules/mips64r6 new file mode 120000 index 000000000..af28acbd9 --- /dev/null +++ b/debian/installer/modules/mips64r6 @@ -0,0 +1 @@ +mips \ No newline at end of file diff --git a/debian/installer/modules/mips64r6el b/debian/installer/modules/mips64r6el new file mode 120000 index 000000000..af28acbd9 --- /dev/null +++ b/debian/installer/modules/mips64r6el @@ -0,0 +1 @@ +mips \ No newline at end of file diff --git a/debian/installer/modules/mipsel-4kc-malta b/debian/installer/modules/mipsel-4kc-malta new file mode 120000 index 000000000..6bae6ca28 --- /dev/null +++ b/debian/installer/modules/mipsel-4kc-malta @@ -0,0 +1 @@ +mips-4kc-malta \ No newline at end of file diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/affs-modules b/debian/installer/modules/mipsel-loongson-3/affs-modules similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/affs-modules rename to debian/installer/modules/mipsel-loongson-3/affs-modules diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/ata-modules b/debian/installer/modules/mipsel-loongson-3/ata-modules similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/ata-modules rename to debian/installer/modules/mipsel-loongson-3/ata-modules diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/btrfs-modules b/debian/installer/modules/mipsel-loongson-3/btrfs-modules similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/btrfs-modules rename to debian/installer/modules/mipsel-loongson-3/btrfs-modules diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/cdrom-core-modules b/debian/installer/modules/mipsel-loongson-3/cdrom-core-modules similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/cdrom-core-modules rename to debian/installer/modules/mipsel-loongson-3/cdrom-core-modules diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/compress-modules b/debian/installer/modules/mipsel-loongson-3/compress-modules similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/compress-modules rename to debian/installer/modules/mipsel-loongson-3/compress-modules diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/crc-modules b/debian/installer/modules/mipsel-loongson-3/crc-modules similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/crc-modules rename to debian/installer/modules/mipsel-loongson-3/crc-modules diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/crypto-dm-modules b/debian/installer/modules/mipsel-loongson-3/crypto-dm-modules similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/crypto-dm-modules rename to debian/installer/modules/mipsel-loongson-3/crypto-dm-modules diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/crypto-modules b/debian/installer/modules/mipsel-loongson-3/crypto-modules similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/crypto-modules rename to debian/installer/modules/mipsel-loongson-3/crypto-modules diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/event-modules b/debian/installer/modules/mipsel-loongson-3/event-modules similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/event-modules rename to debian/installer/modules/mipsel-loongson-3/event-modules diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/ext4-modules b/debian/installer/modules/mipsel-loongson-3/ext4-modules similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/ext4-modules rename to debian/installer/modules/mipsel-loongson-3/ext4-modules diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/fat-modules b/debian/installer/modules/mipsel-loongson-3/fat-modules similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/fat-modules rename to debian/installer/modules/mipsel-loongson-3/fat-modules diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/fb-modules b/debian/installer/modules/mipsel-loongson-3/fb-modules similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/fb-modules rename to debian/installer/modules/mipsel-loongson-3/fb-modules diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/firewire-core-modules b/debian/installer/modules/mipsel-loongson-3/firewire-core-modules similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/firewire-core-modules rename to debian/installer/modules/mipsel-loongson-3/firewire-core-modules diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/fuse-modules b/debian/installer/modules/mipsel-loongson-3/fuse-modules similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/fuse-modules rename to debian/installer/modules/mipsel-loongson-3/fuse-modules diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/hfs-modules b/debian/installer/modules/mipsel-loongson-3/hfs-modules similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/hfs-modules rename to debian/installer/modules/mipsel-loongson-3/hfs-modules diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/input-modules b/debian/installer/modules/mipsel-loongson-3/input-modules similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/input-modules rename to debian/installer/modules/mipsel-loongson-3/input-modules diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/isofs-modules b/debian/installer/modules/mipsel-loongson-3/isofs-modules similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/isofs-modules rename to debian/installer/modules/mipsel-loongson-3/isofs-modules diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/jfs-modules b/debian/installer/modules/mipsel-loongson-3/jfs-modules similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/jfs-modules rename to debian/installer/modules/mipsel-loongson-3/jfs-modules diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/kernel-image b/debian/installer/modules/mipsel-loongson-3/kernel-image similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/kernel-image rename to debian/installer/modules/mipsel-loongson-3/kernel-image diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/loop-modules b/debian/installer/modules/mipsel-loongson-3/loop-modules similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/loop-modules rename to debian/installer/modules/mipsel-loongson-3/loop-modules diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/md-modules b/debian/installer/modules/mipsel-loongson-3/md-modules similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/md-modules rename to debian/installer/modules/mipsel-loongson-3/md-modules diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/minix-modules b/debian/installer/modules/mipsel-loongson-3/minix-modules similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/minix-modules rename to debian/installer/modules/mipsel-loongson-3/minix-modules diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/multipath-modules b/debian/installer/modules/mipsel-loongson-3/multipath-modules similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/multipath-modules rename to debian/installer/modules/mipsel-loongson-3/multipath-modules diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/nbd-modules b/debian/installer/modules/mipsel-loongson-3/nbd-modules similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/nbd-modules rename to debian/installer/modules/mipsel-loongson-3/nbd-modules diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/nfs-modules b/debian/installer/modules/mipsel-loongson-3/nfs-modules similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/nfs-modules rename to debian/installer/modules/mipsel-loongson-3/nfs-modules diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/nic-modules b/debian/installer/modules/mipsel-loongson-3/nic-modules similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/nic-modules rename to debian/installer/modules/mipsel-loongson-3/nic-modules diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/nic-shared-modules b/debian/installer/modules/mipsel-loongson-3/nic-shared-modules similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/nic-shared-modules rename to debian/installer/modules/mipsel-loongson-3/nic-shared-modules diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/nic-usb-modules b/debian/installer/modules/mipsel-loongson-3/nic-usb-modules similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/nic-usb-modules rename to debian/installer/modules/mipsel-loongson-3/nic-usb-modules diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/nic-wireless-modules b/debian/installer/modules/mipsel-loongson-3/nic-wireless-modules similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/nic-wireless-modules rename to debian/installer/modules/mipsel-loongson-3/nic-wireless-modules diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/ntfs-modules b/debian/installer/modules/mipsel-loongson-3/ntfs-modules similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/ntfs-modules rename to debian/installer/modules/mipsel-loongson-3/ntfs-modules diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/pata-modules b/debian/installer/modules/mipsel-loongson-3/pata-modules similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/pata-modules rename to debian/installer/modules/mipsel-loongson-3/pata-modules diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/ppp-modules b/debian/installer/modules/mipsel-loongson-3/ppp-modules similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/ppp-modules rename to debian/installer/modules/mipsel-loongson-3/ppp-modules diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/qnx4-modules b/debian/installer/modules/mipsel-loongson-3/qnx4-modules similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/qnx4-modules rename to debian/installer/modules/mipsel-loongson-3/qnx4-modules diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/sata-modules b/debian/installer/modules/mipsel-loongson-3/sata-modules similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/sata-modules rename to debian/installer/modules/mipsel-loongson-3/sata-modules diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/scsi-core-modules b/debian/installer/modules/mipsel-loongson-3/scsi-core-modules similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/scsi-core-modules rename to debian/installer/modules/mipsel-loongson-3/scsi-core-modules diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/scsi-modules b/debian/installer/modules/mipsel-loongson-3/scsi-modules similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/scsi-modules rename to debian/installer/modules/mipsel-loongson-3/scsi-modules diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/sound-modules b/debian/installer/modules/mipsel-loongson-3/sound-modules similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/sound-modules rename to debian/installer/modules/mipsel-loongson-3/sound-modules diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/speakup-modules b/debian/installer/modules/mipsel-loongson-3/speakup-modules similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/speakup-modules rename to debian/installer/modules/mipsel-loongson-3/speakup-modules diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/squashfs-modules b/debian/installer/modules/mipsel-loongson-3/squashfs-modules similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/squashfs-modules rename to debian/installer/modules/mipsel-loongson-3/squashfs-modules diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/udf-modules b/debian/installer/modules/mipsel-loongson-3/udf-modules similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/udf-modules rename to debian/installer/modules/mipsel-loongson-3/udf-modules diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/usb-modules b/debian/installer/modules/mipsel-loongson-3/usb-modules similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/usb-modules rename to debian/installer/modules/mipsel-loongson-3/usb-modules diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/usb-serial-modules b/debian/installer/modules/mipsel-loongson-3/usb-serial-modules similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/usb-serial-modules rename to debian/installer/modules/mipsel-loongson-3/usb-serial-modules diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/usb-storage-modules b/debian/installer/modules/mipsel-loongson-3/usb-storage-modules similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/usb-storage-modules rename to debian/installer/modules/mipsel-loongson-3/usb-storage-modules diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/virtio-modules b/debian/installer/modules/mipsel-loongson-3/virtio-modules similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/virtio-modules rename to debian/installer/modules/mipsel-loongson-3/virtio-modules diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/xfs-modules b/debian/installer/modules/mipsel-loongson-3/xfs-modules similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/xfs-modules rename to debian/installer/modules/mipsel-loongson-3/xfs-modules diff --git a/debian/installer/mipsel/modules/mipsel-loongson-3/zlib-modules b/debian/installer/modules/mipsel-loongson-3/zlib-modules similarity index 100% rename from debian/installer/mipsel/modules/mipsel-loongson-3/zlib-modules rename to debian/installer/modules/mipsel-loongson-3/zlib-modules diff --git a/debian/installer/modules/mipsel-octeon b/debian/installer/modules/mipsel-octeon new file mode 120000 index 000000000..47b1b81ab --- /dev/null +++ b/debian/installer/modules/mipsel-octeon @@ -0,0 +1 @@ +mips-octeon \ No newline at end of file diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/affs-modules b/debian/installer/modules/powerpc-powerpc-miboot/affs-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc-miboot/affs-modules rename to debian/installer/modules/powerpc-powerpc-miboot/affs-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/ata-modules b/debian/installer/modules/powerpc-powerpc-miboot/ata-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc-miboot/ata-modules rename to debian/installer/modules/powerpc-powerpc-miboot/ata-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/btrfs-modules b/debian/installer/modules/powerpc-powerpc-miboot/btrfs-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc-miboot/btrfs-modules rename to debian/installer/modules/powerpc-powerpc-miboot/btrfs-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/cdrom-core-modules b/debian/installer/modules/powerpc-powerpc-miboot/cdrom-core-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc-miboot/cdrom-core-modules rename to debian/installer/modules/powerpc-powerpc-miboot/cdrom-core-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/compress-modules b/debian/installer/modules/powerpc-powerpc-miboot/compress-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc-miboot/compress-modules rename to debian/installer/modules/powerpc-powerpc-miboot/compress-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/crc-modules b/debian/installer/modules/powerpc-powerpc-miboot/crc-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc-miboot/crc-modules rename to debian/installer/modules/powerpc-powerpc-miboot/crc-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/crypto-dm-modules b/debian/installer/modules/powerpc-powerpc-miboot/crypto-dm-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc-miboot/crypto-dm-modules rename to debian/installer/modules/powerpc-powerpc-miboot/crypto-dm-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/crypto-modules b/debian/installer/modules/powerpc-powerpc-miboot/crypto-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc-miboot/crypto-modules rename to debian/installer/modules/powerpc-powerpc-miboot/crypto-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/event-modules b/debian/installer/modules/powerpc-powerpc-miboot/event-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc-miboot/event-modules rename to debian/installer/modules/powerpc-powerpc-miboot/event-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/ext4-modules b/debian/installer/modules/powerpc-powerpc-miboot/ext4-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc-miboot/ext4-modules rename to debian/installer/modules/powerpc-powerpc-miboot/ext4-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/fat-modules b/debian/installer/modules/powerpc-powerpc-miboot/fat-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc-miboot/fat-modules rename to debian/installer/modules/powerpc-powerpc-miboot/fat-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/firewire-core-modules b/debian/installer/modules/powerpc-powerpc-miboot/firewire-core-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc-miboot/firewire-core-modules rename to debian/installer/modules/powerpc-powerpc-miboot/firewire-core-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/fuse-modules b/debian/installer/modules/powerpc-powerpc-miboot/fuse-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc-miboot/fuse-modules rename to debian/installer/modules/powerpc-powerpc-miboot/fuse-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/hfs-modules b/debian/installer/modules/powerpc-powerpc-miboot/hfs-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc-miboot/hfs-modules rename to debian/installer/modules/powerpc-powerpc-miboot/hfs-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/input-modules b/debian/installer/modules/powerpc-powerpc-miboot/input-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc-miboot/input-modules rename to debian/installer/modules/powerpc-powerpc-miboot/input-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/isofs-modules b/debian/installer/modules/powerpc-powerpc-miboot/isofs-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc-miboot/isofs-modules rename to debian/installer/modules/powerpc-powerpc-miboot/isofs-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/jfs-modules b/debian/installer/modules/powerpc-powerpc-miboot/jfs-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc-miboot/jfs-modules rename to debian/installer/modules/powerpc-powerpc-miboot/jfs-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/kernel-image b/debian/installer/modules/powerpc-powerpc-miboot/kernel-image similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc-miboot/kernel-image rename to debian/installer/modules/powerpc-powerpc-miboot/kernel-image diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/loop-modules b/debian/installer/modules/powerpc-powerpc-miboot/loop-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc-miboot/loop-modules rename to debian/installer/modules/powerpc-powerpc-miboot/loop-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/md-modules b/debian/installer/modules/powerpc-powerpc-miboot/md-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc-miboot/md-modules rename to debian/installer/modules/powerpc-powerpc-miboot/md-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/mouse-modules b/debian/installer/modules/powerpc-powerpc-miboot/mouse-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc-miboot/mouse-modules rename to debian/installer/modules/powerpc-powerpc-miboot/mouse-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/multipath-modules b/debian/installer/modules/powerpc-powerpc-miboot/multipath-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc-miboot/multipath-modules rename to debian/installer/modules/powerpc-powerpc-miboot/multipath-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/nbd-modules b/debian/installer/modules/powerpc-powerpc-miboot/nbd-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc-miboot/nbd-modules rename to debian/installer/modules/powerpc-powerpc-miboot/nbd-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/nic-modules b/debian/installer/modules/powerpc-powerpc-miboot/nic-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc-miboot/nic-modules rename to debian/installer/modules/powerpc-powerpc-miboot/nic-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/nic-pcmcia-modules b/debian/installer/modules/powerpc-powerpc-miboot/nic-pcmcia-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc-miboot/nic-pcmcia-modules rename to debian/installer/modules/powerpc-powerpc-miboot/nic-pcmcia-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/nic-shared-modules b/debian/installer/modules/powerpc-powerpc-miboot/nic-shared-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc-miboot/nic-shared-modules rename to debian/installer/modules/powerpc-powerpc-miboot/nic-shared-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/pata-modules b/debian/installer/modules/powerpc-powerpc-miboot/pata-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc-miboot/pata-modules rename to debian/installer/modules/powerpc-powerpc-miboot/pata-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/pcmcia-modules b/debian/installer/modules/powerpc-powerpc-miboot/pcmcia-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc-miboot/pcmcia-modules rename to debian/installer/modules/powerpc-powerpc-miboot/pcmcia-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/pcmcia-storage-modules b/debian/installer/modules/powerpc-powerpc-miboot/pcmcia-storage-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc-miboot/pcmcia-storage-modules rename to debian/installer/modules/powerpc-powerpc-miboot/pcmcia-storage-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/ppp-modules b/debian/installer/modules/powerpc-powerpc-miboot/ppp-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc-miboot/ppp-modules rename to debian/installer/modules/powerpc-powerpc-miboot/ppp-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/sata-modules b/debian/installer/modules/powerpc-powerpc-miboot/sata-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc-miboot/sata-modules rename to debian/installer/modules/powerpc-powerpc-miboot/sata-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/scsi-core-modules b/debian/installer/modules/powerpc-powerpc-miboot/scsi-core-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc-miboot/scsi-core-modules rename to debian/installer/modules/powerpc-powerpc-miboot/scsi-core-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/scsi-modules b/debian/installer/modules/powerpc-powerpc-miboot/scsi-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc-miboot/scsi-modules rename to debian/installer/modules/powerpc-powerpc-miboot/scsi-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/serial-modules b/debian/installer/modules/powerpc-powerpc-miboot/serial-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc-miboot/serial-modules rename to debian/installer/modules/powerpc-powerpc-miboot/serial-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/squashfs-modules b/debian/installer/modules/powerpc-powerpc-miboot/squashfs-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc-miboot/squashfs-modules rename to debian/installer/modules/powerpc-powerpc-miboot/squashfs-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/udf-modules b/debian/installer/modules/powerpc-powerpc-miboot/udf-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc-miboot/udf-modules rename to debian/installer/modules/powerpc-powerpc-miboot/udf-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/uinput-modules b/debian/installer/modules/powerpc-powerpc-miboot/uinput-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc-miboot/uinput-modules rename to debian/installer/modules/powerpc-powerpc-miboot/uinput-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/usb-modules b/debian/installer/modules/powerpc-powerpc-miboot/usb-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc-miboot/usb-modules rename to debian/installer/modules/powerpc-powerpc-miboot/usb-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/usb-serial-modules b/debian/installer/modules/powerpc-powerpc-miboot/usb-serial-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc-miboot/usb-serial-modules rename to debian/installer/modules/powerpc-powerpc-miboot/usb-serial-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/usb-storage-modules b/debian/installer/modules/powerpc-powerpc-miboot/usb-storage-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc-miboot/usb-storage-modules rename to debian/installer/modules/powerpc-powerpc-miboot/usb-storage-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/xfs-modules b/debian/installer/modules/powerpc-powerpc-miboot/xfs-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc-miboot/xfs-modules rename to debian/installer/modules/powerpc-powerpc-miboot/xfs-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/zlib-modules b/debian/installer/modules/powerpc-powerpc-miboot/zlib-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc-miboot/zlib-modules rename to debian/installer/modules/powerpc-powerpc-miboot/zlib-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/affs-modules b/debian/installer/modules/powerpc-powerpc64/affs-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc64/affs-modules rename to debian/installer/modules/powerpc-powerpc64/affs-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/ata-modules b/debian/installer/modules/powerpc-powerpc64/ata-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc64/ata-modules rename to debian/installer/modules/powerpc-powerpc64/ata-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/btrfs-modules b/debian/installer/modules/powerpc-powerpc64/btrfs-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc64/btrfs-modules rename to debian/installer/modules/powerpc-powerpc64/btrfs-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/cdrom-core-modules b/debian/installer/modules/powerpc-powerpc64/cdrom-core-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc64/cdrom-core-modules rename to debian/installer/modules/powerpc-powerpc64/cdrom-core-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/compress-modules b/debian/installer/modules/powerpc-powerpc64/compress-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc64/compress-modules rename to debian/installer/modules/powerpc-powerpc64/compress-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/crc-modules b/debian/installer/modules/powerpc-powerpc64/crc-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc64/crc-modules rename to debian/installer/modules/powerpc-powerpc64/crc-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/crypto-dm-modules b/debian/installer/modules/powerpc-powerpc64/crypto-dm-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc64/crypto-dm-modules rename to debian/installer/modules/powerpc-powerpc64/crypto-dm-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/crypto-modules b/debian/installer/modules/powerpc-powerpc64/crypto-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc64/crypto-modules rename to debian/installer/modules/powerpc-powerpc64/crypto-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/event-modules b/debian/installer/modules/powerpc-powerpc64/event-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc64/event-modules rename to debian/installer/modules/powerpc-powerpc64/event-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/ext4-modules b/debian/installer/modules/powerpc-powerpc64/ext4-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc64/ext4-modules rename to debian/installer/modules/powerpc-powerpc64/ext4-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/fancontrol-modules b/debian/installer/modules/powerpc-powerpc64/fancontrol-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc64/fancontrol-modules rename to debian/installer/modules/powerpc-powerpc64/fancontrol-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/fat-modules b/debian/installer/modules/powerpc-powerpc64/fat-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc64/fat-modules rename to debian/installer/modules/powerpc-powerpc64/fat-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/firewire-core-modules b/debian/installer/modules/powerpc-powerpc64/firewire-core-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc64/firewire-core-modules rename to debian/installer/modules/powerpc-powerpc64/firewire-core-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/fuse-modules b/debian/installer/modules/powerpc-powerpc64/fuse-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc64/fuse-modules rename to debian/installer/modules/powerpc-powerpc64/fuse-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/hfs-modules b/debian/installer/modules/powerpc-powerpc64/hfs-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc64/hfs-modules rename to debian/installer/modules/powerpc-powerpc64/hfs-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/hypervisor-modules b/debian/installer/modules/powerpc-powerpc64/hypervisor-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc64/hypervisor-modules rename to debian/installer/modules/powerpc-powerpc64/hypervisor-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/input-modules b/debian/installer/modules/powerpc-powerpc64/input-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc64/input-modules rename to debian/installer/modules/powerpc-powerpc64/input-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/isofs-modules b/debian/installer/modules/powerpc-powerpc64/isofs-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc64/isofs-modules rename to debian/installer/modules/powerpc-powerpc64/isofs-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/jfs-modules b/debian/installer/modules/powerpc-powerpc64/jfs-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc64/jfs-modules rename to debian/installer/modules/powerpc-powerpc64/jfs-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/kernel-image b/debian/installer/modules/powerpc-powerpc64/kernel-image similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc64/kernel-image rename to debian/installer/modules/powerpc-powerpc64/kernel-image diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/loop-modules b/debian/installer/modules/powerpc-powerpc64/loop-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc64/loop-modules rename to debian/installer/modules/powerpc-powerpc64/loop-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/md-modules b/debian/installer/modules/powerpc-powerpc64/md-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc64/md-modules rename to debian/installer/modules/powerpc-powerpc64/md-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/mouse-modules b/debian/installer/modules/powerpc-powerpc64/mouse-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc64/mouse-modules rename to debian/installer/modules/powerpc-powerpc64/mouse-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/multipath-modules b/debian/installer/modules/powerpc-powerpc64/multipath-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc64/multipath-modules rename to debian/installer/modules/powerpc-powerpc64/multipath-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/nbd-modules b/debian/installer/modules/powerpc-powerpc64/nbd-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc64/nbd-modules rename to debian/installer/modules/powerpc-powerpc64/nbd-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/nic-modules b/debian/installer/modules/powerpc-powerpc64/nic-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc64/nic-modules rename to debian/installer/modules/powerpc-powerpc64/nic-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/nic-pcmcia-modules b/debian/installer/modules/powerpc-powerpc64/nic-pcmcia-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc64/nic-pcmcia-modules rename to debian/installer/modules/powerpc-powerpc64/nic-pcmcia-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/nic-shared-modules b/debian/installer/modules/powerpc-powerpc64/nic-shared-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc64/nic-shared-modules rename to debian/installer/modules/powerpc-powerpc64/nic-shared-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/pata-modules b/debian/installer/modules/powerpc-powerpc64/pata-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc64/pata-modules rename to debian/installer/modules/powerpc-powerpc64/pata-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/pcmcia-modules b/debian/installer/modules/powerpc-powerpc64/pcmcia-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc64/pcmcia-modules rename to debian/installer/modules/powerpc-powerpc64/pcmcia-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/pcmcia-storage-modules b/debian/installer/modules/powerpc-powerpc64/pcmcia-storage-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc64/pcmcia-storage-modules rename to debian/installer/modules/powerpc-powerpc64/pcmcia-storage-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/ppp-modules b/debian/installer/modules/powerpc-powerpc64/ppp-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc64/ppp-modules rename to debian/installer/modules/powerpc-powerpc64/ppp-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/sata-modules b/debian/installer/modules/powerpc-powerpc64/sata-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc64/sata-modules rename to debian/installer/modules/powerpc-powerpc64/sata-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/scsi-core-modules b/debian/installer/modules/powerpc-powerpc64/scsi-core-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc64/scsi-core-modules rename to debian/installer/modules/powerpc-powerpc64/scsi-core-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/scsi-modules b/debian/installer/modules/powerpc-powerpc64/scsi-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc64/scsi-modules rename to debian/installer/modules/powerpc-powerpc64/scsi-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/serial-modules b/debian/installer/modules/powerpc-powerpc64/serial-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc64/serial-modules rename to debian/installer/modules/powerpc-powerpc64/serial-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/squashfs-modules b/debian/installer/modules/powerpc-powerpc64/squashfs-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc64/squashfs-modules rename to debian/installer/modules/powerpc-powerpc64/squashfs-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/udf-modules b/debian/installer/modules/powerpc-powerpc64/udf-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc64/udf-modules rename to debian/installer/modules/powerpc-powerpc64/udf-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/uinput-modules b/debian/installer/modules/powerpc-powerpc64/uinput-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc64/uinput-modules rename to debian/installer/modules/powerpc-powerpc64/uinput-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/usb-modules b/debian/installer/modules/powerpc-powerpc64/usb-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc64/usb-modules rename to debian/installer/modules/powerpc-powerpc64/usb-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/usb-serial-modules b/debian/installer/modules/powerpc-powerpc64/usb-serial-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc64/usb-serial-modules rename to debian/installer/modules/powerpc-powerpc64/usb-serial-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/usb-storage-modules b/debian/installer/modules/powerpc-powerpc64/usb-storage-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc64/usb-storage-modules rename to debian/installer/modules/powerpc-powerpc64/usb-storage-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/virtio-modules b/debian/installer/modules/powerpc-powerpc64/virtio-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc64/virtio-modules rename to debian/installer/modules/powerpc-powerpc64/virtio-modules diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/xfs-modules b/debian/installer/modules/powerpc-powerpc64/xfs-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc-powerpc64/xfs-modules rename to debian/installer/modules/powerpc-powerpc64/xfs-modules diff --git a/debian/installer/powerpc/modules/powerpc/affs-modules b/debian/installer/modules/powerpc/affs-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc/affs-modules rename to debian/installer/modules/powerpc/affs-modules diff --git a/debian/installer/powerpc/modules/powerpc/ata-modules b/debian/installer/modules/powerpc/ata-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc/ata-modules rename to debian/installer/modules/powerpc/ata-modules diff --git a/debian/installer/powerpc/modules/powerpc/btrfs-modules b/debian/installer/modules/powerpc/btrfs-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc/btrfs-modules rename to debian/installer/modules/powerpc/btrfs-modules diff --git a/debian/installer/powerpc/modules/powerpc/cdrom-core-modules b/debian/installer/modules/powerpc/cdrom-core-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc/cdrom-core-modules rename to debian/installer/modules/powerpc/cdrom-core-modules diff --git a/debian/installer/powerpc/modules/powerpc/compress-modules b/debian/installer/modules/powerpc/compress-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc/compress-modules rename to debian/installer/modules/powerpc/compress-modules diff --git a/debian/installer/powerpc/modules/powerpc/crc-modules b/debian/installer/modules/powerpc/crc-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc/crc-modules rename to debian/installer/modules/powerpc/crc-modules diff --git a/debian/installer/powerpc/modules/powerpc/crypto-dm-modules b/debian/installer/modules/powerpc/crypto-dm-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc/crypto-dm-modules rename to debian/installer/modules/powerpc/crypto-dm-modules diff --git a/debian/installer/powerpc/modules/powerpc/crypto-modules b/debian/installer/modules/powerpc/crypto-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc/crypto-modules rename to debian/installer/modules/powerpc/crypto-modules diff --git a/debian/installer/powerpc/modules/powerpc/event-modules b/debian/installer/modules/powerpc/event-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc/event-modules rename to debian/installer/modules/powerpc/event-modules diff --git a/debian/installer/powerpc/modules/powerpc/ext4-modules b/debian/installer/modules/powerpc/ext4-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc/ext4-modules rename to debian/installer/modules/powerpc/ext4-modules diff --git a/debian/installer/powerpc/modules/powerpc/fat-modules b/debian/installer/modules/powerpc/fat-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc/fat-modules rename to debian/installer/modules/powerpc/fat-modules diff --git a/debian/installer/powerpc/modules/powerpc/fb-modules b/debian/installer/modules/powerpc/fb-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc/fb-modules rename to debian/installer/modules/powerpc/fb-modules diff --git a/debian/installer/powerpc/modules/powerpc/firewire-core-modules b/debian/installer/modules/powerpc/firewire-core-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc/firewire-core-modules rename to debian/installer/modules/powerpc/firewire-core-modules diff --git a/debian/installer/powerpc/modules/powerpc/fuse-modules b/debian/installer/modules/powerpc/fuse-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc/fuse-modules rename to debian/installer/modules/powerpc/fuse-modules diff --git a/debian/installer/powerpc/modules/powerpc/hfs-modules b/debian/installer/modules/powerpc/hfs-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc/hfs-modules rename to debian/installer/modules/powerpc/hfs-modules diff --git a/debian/installer/powerpc/modules/powerpc/input-modules b/debian/installer/modules/powerpc/input-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc/input-modules rename to debian/installer/modules/powerpc/input-modules diff --git a/debian/installer/powerpc/modules/powerpc/isofs-modules b/debian/installer/modules/powerpc/isofs-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc/isofs-modules rename to debian/installer/modules/powerpc/isofs-modules diff --git a/debian/installer/powerpc/modules/powerpc/jfs-modules b/debian/installer/modules/powerpc/jfs-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc/jfs-modules rename to debian/installer/modules/powerpc/jfs-modules diff --git a/debian/installer/powerpc/modules/powerpc/kernel-image b/debian/installer/modules/powerpc/kernel-image similarity index 100% rename from debian/installer/powerpc/modules/powerpc/kernel-image rename to debian/installer/modules/powerpc/kernel-image diff --git a/debian/installer/powerpc/modules/powerpc/loop-modules b/debian/installer/modules/powerpc/loop-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc/loop-modules rename to debian/installer/modules/powerpc/loop-modules diff --git a/debian/installer/powerpc/modules/powerpc/md-modules b/debian/installer/modules/powerpc/md-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc/md-modules rename to debian/installer/modules/powerpc/md-modules diff --git a/debian/installer/powerpc/modules/powerpc/mouse-modules b/debian/installer/modules/powerpc/mouse-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc/mouse-modules rename to debian/installer/modules/powerpc/mouse-modules diff --git a/debian/installer/powerpc/modules/powerpc/multipath-modules b/debian/installer/modules/powerpc/multipath-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc/multipath-modules rename to debian/installer/modules/powerpc/multipath-modules diff --git a/debian/installer/powerpc/modules/powerpc/nbd-modules b/debian/installer/modules/powerpc/nbd-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc/nbd-modules rename to debian/installer/modules/powerpc/nbd-modules diff --git a/debian/installer/powerpc/modules/powerpc/nic-modules b/debian/installer/modules/powerpc/nic-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc/nic-modules rename to debian/installer/modules/powerpc/nic-modules diff --git a/debian/installer/powerpc/modules/powerpc/nic-pcmcia-modules b/debian/installer/modules/powerpc/nic-pcmcia-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc/nic-pcmcia-modules rename to debian/installer/modules/powerpc/nic-pcmcia-modules diff --git a/debian/installer/powerpc/modules/powerpc/nic-shared-modules b/debian/installer/modules/powerpc/nic-shared-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc/nic-shared-modules rename to debian/installer/modules/powerpc/nic-shared-modules diff --git a/debian/installer/powerpc/modules/powerpc/pata-modules b/debian/installer/modules/powerpc/pata-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc/pata-modules rename to debian/installer/modules/powerpc/pata-modules diff --git a/debian/installer/powerpc/modules/powerpc/pcmcia-modules b/debian/installer/modules/powerpc/pcmcia-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc/pcmcia-modules rename to debian/installer/modules/powerpc/pcmcia-modules diff --git a/debian/installer/powerpc/modules/powerpc/pcmcia-storage-modules b/debian/installer/modules/powerpc/pcmcia-storage-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc/pcmcia-storage-modules rename to debian/installer/modules/powerpc/pcmcia-storage-modules diff --git a/debian/installer/powerpc/modules/powerpc/ppp-modules b/debian/installer/modules/powerpc/ppp-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc/ppp-modules rename to debian/installer/modules/powerpc/ppp-modules diff --git a/debian/installer/powerpc/modules/powerpc/sata-modules b/debian/installer/modules/powerpc/sata-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc/sata-modules rename to debian/installer/modules/powerpc/sata-modules diff --git a/debian/installer/powerpc/modules/powerpc/scsi-core-modules b/debian/installer/modules/powerpc/scsi-core-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc/scsi-core-modules rename to debian/installer/modules/powerpc/scsi-core-modules diff --git a/debian/installer/powerpc/modules/powerpc/scsi-modules b/debian/installer/modules/powerpc/scsi-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc/scsi-modules rename to debian/installer/modules/powerpc/scsi-modules diff --git a/debian/installer/powerpc/modules/powerpc/serial-modules b/debian/installer/modules/powerpc/serial-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc/serial-modules rename to debian/installer/modules/powerpc/serial-modules diff --git a/debian/installer/powerpc/modules/powerpc/squashfs-modules b/debian/installer/modules/powerpc/squashfs-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc/squashfs-modules rename to debian/installer/modules/powerpc/squashfs-modules diff --git a/debian/installer/powerpc/modules/powerpc/udf-modules b/debian/installer/modules/powerpc/udf-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc/udf-modules rename to debian/installer/modules/powerpc/udf-modules diff --git a/debian/installer/powerpc/modules/powerpc/uinput-modules b/debian/installer/modules/powerpc/uinput-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc/uinput-modules rename to debian/installer/modules/powerpc/uinput-modules diff --git a/debian/installer/powerpc/modules/powerpc/usb-modules b/debian/installer/modules/powerpc/usb-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc/usb-modules rename to debian/installer/modules/powerpc/usb-modules diff --git a/debian/installer/powerpc/modules/powerpc/usb-serial-modules b/debian/installer/modules/powerpc/usb-serial-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc/usb-serial-modules rename to debian/installer/modules/powerpc/usb-serial-modules diff --git a/debian/installer/powerpc/modules/powerpc/usb-storage-modules b/debian/installer/modules/powerpc/usb-storage-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc/usb-storage-modules rename to debian/installer/modules/powerpc/usb-storage-modules diff --git a/debian/installer/powerpc/modules/powerpc/virtio-modules b/debian/installer/modules/powerpc/virtio-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc/virtio-modules rename to debian/installer/modules/powerpc/virtio-modules diff --git a/debian/installer/powerpc/modules/powerpc/xfs-modules b/debian/installer/modules/powerpc/xfs-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc/xfs-modules rename to debian/installer/modules/powerpc/xfs-modules diff --git a/debian/installer/powerpc/modules/powerpc/zlib-modules b/debian/installer/modules/powerpc/zlib-modules similarity index 100% rename from debian/installer/powerpc/modules/powerpc/zlib-modules rename to debian/installer/modules/powerpc/zlib-modules diff --git a/debian/installer/modules/ppc64 b/debian/installer/modules/ppc64 new file mode 120000 index 000000000..a3e2a5788 --- /dev/null +++ b/debian/installer/modules/ppc64 @@ -0,0 +1 @@ +powerpc-powerpc64 \ No newline at end of file diff --git a/debian/installer/ppc64el/modules/ppc64el/ata-modules b/debian/installer/modules/ppc64el/ata-modules similarity index 100% rename from debian/installer/ppc64el/modules/ppc64el/ata-modules rename to debian/installer/modules/ppc64el/ata-modules diff --git a/debian/installer/ppc64el/modules/ppc64el/btrfs-modules b/debian/installer/modules/ppc64el/btrfs-modules similarity index 100% rename from debian/installer/ppc64el/modules/ppc64el/btrfs-modules rename to debian/installer/modules/ppc64el/btrfs-modules diff --git a/debian/installer/ppc64el/modules/ppc64el/cdrom-core-modules b/debian/installer/modules/ppc64el/cdrom-core-modules similarity index 100% rename from debian/installer/ppc64el/modules/ppc64el/cdrom-core-modules rename to debian/installer/modules/ppc64el/cdrom-core-modules diff --git a/debian/installer/ppc64el/modules/ppc64el/compress-modules b/debian/installer/modules/ppc64el/compress-modules similarity index 100% rename from debian/installer/ppc64el/modules/ppc64el/compress-modules rename to debian/installer/modules/ppc64el/compress-modules diff --git a/debian/installer/ppc64el/modules/ppc64el/crc-modules b/debian/installer/modules/ppc64el/crc-modules similarity index 100% rename from debian/installer/ppc64el/modules/ppc64el/crc-modules rename to debian/installer/modules/ppc64el/crc-modules diff --git a/debian/installer/ppc64el/modules/ppc64el/crypto-dm-modules b/debian/installer/modules/ppc64el/crypto-dm-modules similarity index 100% rename from debian/installer/ppc64el/modules/ppc64el/crypto-dm-modules rename to debian/installer/modules/ppc64el/crypto-dm-modules diff --git a/debian/installer/ppc64el/modules/ppc64el/crypto-modules b/debian/installer/modules/ppc64el/crypto-modules similarity index 100% rename from debian/installer/ppc64el/modules/ppc64el/crypto-modules rename to debian/installer/modules/ppc64el/crypto-modules diff --git a/debian/installer/ppc64el/modules/ppc64el/event-modules b/debian/installer/modules/ppc64el/event-modules similarity index 100% rename from debian/installer/ppc64el/modules/ppc64el/event-modules rename to debian/installer/modules/ppc64el/event-modules diff --git a/debian/installer/ppc64el/modules/ppc64el/ext4-modules b/debian/installer/modules/ppc64el/ext4-modules similarity index 100% rename from debian/installer/ppc64el/modules/ppc64el/ext4-modules rename to debian/installer/modules/ppc64el/ext4-modules diff --git a/debian/installer/ppc64el/modules/ppc64el/fancontrol-modules b/debian/installer/modules/ppc64el/fancontrol-modules similarity index 100% rename from debian/installer/ppc64el/modules/ppc64el/fancontrol-modules rename to debian/installer/modules/ppc64el/fancontrol-modules diff --git a/debian/installer/ppc64el/modules/ppc64el/fat-modules b/debian/installer/modules/ppc64el/fat-modules similarity index 100% rename from debian/installer/ppc64el/modules/ppc64el/fat-modules rename to debian/installer/modules/ppc64el/fat-modules diff --git a/debian/installer/ppc64el/modules/ppc64el/firewire-core-modules b/debian/installer/modules/ppc64el/firewire-core-modules similarity index 100% rename from debian/installer/ppc64el/modules/ppc64el/firewire-core-modules rename to debian/installer/modules/ppc64el/firewire-core-modules diff --git a/debian/installer/ppc64el/modules/ppc64el/fuse-modules b/debian/installer/modules/ppc64el/fuse-modules similarity index 100% rename from debian/installer/ppc64el/modules/ppc64el/fuse-modules rename to debian/installer/modules/ppc64el/fuse-modules diff --git a/debian/installer/ppc64el/modules/ppc64el/hypervisor-modules b/debian/installer/modules/ppc64el/hypervisor-modules similarity index 100% rename from debian/installer/ppc64el/modules/ppc64el/hypervisor-modules rename to debian/installer/modules/ppc64el/hypervisor-modules diff --git a/debian/installer/ppc64el/modules/ppc64el/input-modules b/debian/installer/modules/ppc64el/input-modules similarity index 100% rename from debian/installer/ppc64el/modules/ppc64el/input-modules rename to debian/installer/modules/ppc64el/input-modules diff --git a/debian/installer/ppc64el/modules/ppc64el/isofs-modules b/debian/installer/modules/ppc64el/isofs-modules similarity index 100% rename from debian/installer/ppc64el/modules/ppc64el/isofs-modules rename to debian/installer/modules/ppc64el/isofs-modules diff --git a/debian/installer/ppc64el/modules/ppc64el/jfs-modules b/debian/installer/modules/ppc64el/jfs-modules similarity index 100% rename from debian/installer/ppc64el/modules/ppc64el/jfs-modules rename to debian/installer/modules/ppc64el/jfs-modules diff --git a/debian/installer/ppc64el/modules/ppc64el/kernel-image b/debian/installer/modules/ppc64el/kernel-image similarity index 100% rename from debian/installer/ppc64el/modules/ppc64el/kernel-image rename to debian/installer/modules/ppc64el/kernel-image diff --git a/debian/installer/ppc64el/modules/ppc64el/loop-modules b/debian/installer/modules/ppc64el/loop-modules similarity index 100% rename from debian/installer/ppc64el/modules/ppc64el/loop-modules rename to debian/installer/modules/ppc64el/loop-modules diff --git a/debian/installer/ppc64el/modules/ppc64el/md-modules b/debian/installer/modules/ppc64el/md-modules similarity index 100% rename from debian/installer/ppc64el/modules/ppc64el/md-modules rename to debian/installer/modules/ppc64el/md-modules diff --git a/debian/installer/ppc64el/modules/ppc64el/mouse-modules b/debian/installer/modules/ppc64el/mouse-modules similarity index 100% rename from debian/installer/ppc64el/modules/ppc64el/mouse-modules rename to debian/installer/modules/ppc64el/mouse-modules diff --git a/debian/installer/ppc64el/modules/ppc64el/multipath-modules b/debian/installer/modules/ppc64el/multipath-modules similarity index 100% rename from debian/installer/ppc64el/modules/ppc64el/multipath-modules rename to debian/installer/modules/ppc64el/multipath-modules diff --git a/debian/installer/ppc64el/modules/ppc64el/nbd-modules b/debian/installer/modules/ppc64el/nbd-modules similarity index 100% rename from debian/installer/ppc64el/modules/ppc64el/nbd-modules rename to debian/installer/modules/ppc64el/nbd-modules diff --git a/debian/installer/ppc64el/modules/ppc64el/nic-modules b/debian/installer/modules/ppc64el/nic-modules similarity index 100% rename from debian/installer/ppc64el/modules/ppc64el/nic-modules rename to debian/installer/modules/ppc64el/nic-modules diff --git a/debian/installer/ppc64el/modules/ppc64el/nic-shared-modules b/debian/installer/modules/ppc64el/nic-shared-modules similarity index 100% rename from debian/installer/ppc64el/modules/ppc64el/nic-shared-modules rename to debian/installer/modules/ppc64el/nic-shared-modules diff --git a/debian/installer/ppc64el/modules/ppc64el/ppp-modules b/debian/installer/modules/ppc64el/ppp-modules similarity index 100% rename from debian/installer/ppc64el/modules/ppc64el/ppp-modules rename to debian/installer/modules/ppc64el/ppp-modules diff --git a/debian/installer/ppc64el/modules/ppc64el/sata-modules b/debian/installer/modules/ppc64el/sata-modules similarity index 100% rename from debian/installer/ppc64el/modules/ppc64el/sata-modules rename to debian/installer/modules/ppc64el/sata-modules diff --git a/debian/installer/ppc64el/modules/ppc64el/scsi-core-modules b/debian/installer/modules/ppc64el/scsi-core-modules similarity index 100% rename from debian/installer/ppc64el/modules/ppc64el/scsi-core-modules rename to debian/installer/modules/ppc64el/scsi-core-modules diff --git a/debian/installer/ppc64el/modules/ppc64el/scsi-modules b/debian/installer/modules/ppc64el/scsi-modules similarity index 100% rename from debian/installer/ppc64el/modules/ppc64el/scsi-modules rename to debian/installer/modules/ppc64el/scsi-modules diff --git a/debian/installer/ppc64el/modules/ppc64el/serial-modules b/debian/installer/modules/ppc64el/serial-modules similarity index 100% rename from debian/installer/ppc64el/modules/ppc64el/serial-modules rename to debian/installer/modules/ppc64el/serial-modules diff --git a/debian/installer/ppc64el/modules/ppc64el/squashfs-modules b/debian/installer/modules/ppc64el/squashfs-modules similarity index 100% rename from debian/installer/ppc64el/modules/ppc64el/squashfs-modules rename to debian/installer/modules/ppc64el/squashfs-modules diff --git a/debian/installer/ppc64el/modules/ppc64el/udf-modules b/debian/installer/modules/ppc64el/udf-modules similarity index 100% rename from debian/installer/ppc64el/modules/ppc64el/udf-modules rename to debian/installer/modules/ppc64el/udf-modules diff --git a/debian/installer/ppc64el/modules/ppc64el/uinput-modules b/debian/installer/modules/ppc64el/uinput-modules similarity index 100% rename from debian/installer/ppc64el/modules/ppc64el/uinput-modules rename to debian/installer/modules/ppc64el/uinput-modules diff --git a/debian/installer/ppc64el/modules/ppc64el/usb-modules b/debian/installer/modules/ppc64el/usb-modules similarity index 100% rename from debian/installer/ppc64el/modules/ppc64el/usb-modules rename to debian/installer/modules/ppc64el/usb-modules diff --git a/debian/installer/ppc64el/modules/ppc64el/usb-serial-modules b/debian/installer/modules/ppc64el/usb-serial-modules similarity index 100% rename from debian/installer/ppc64el/modules/ppc64el/usb-serial-modules rename to debian/installer/modules/ppc64el/usb-serial-modules diff --git a/debian/installer/ppc64el/modules/ppc64el/usb-storage-modules b/debian/installer/modules/ppc64el/usb-storage-modules similarity index 100% rename from debian/installer/ppc64el/modules/ppc64el/usb-storage-modules rename to debian/installer/modules/ppc64el/usb-storage-modules diff --git a/debian/installer/ppc64el/modules/ppc64el/virtio-modules b/debian/installer/modules/ppc64el/virtio-modules similarity index 100% rename from debian/installer/ppc64el/modules/ppc64el/virtio-modules rename to debian/installer/modules/ppc64el/virtio-modules diff --git a/debian/installer/ppc64el/modules/ppc64el/xfs-modules b/debian/installer/modules/ppc64el/xfs-modules similarity index 100% rename from debian/installer/ppc64el/modules/ppc64el/xfs-modules rename to debian/installer/modules/ppc64el/xfs-modules diff --git a/debian/installer/s390x/modules/s390x/btrfs-modules b/debian/installer/modules/s390x/btrfs-modules similarity index 100% rename from debian/installer/s390x/modules/s390x/btrfs-modules rename to debian/installer/modules/s390x/btrfs-modules diff --git a/debian/installer/s390x/modules/s390x/compress-modules b/debian/installer/modules/s390x/compress-modules similarity index 100% rename from debian/installer/s390x/modules/s390x/compress-modules rename to debian/installer/modules/s390x/compress-modules diff --git a/debian/installer/s390x/modules/s390x/crc-modules b/debian/installer/modules/s390x/crc-modules similarity index 100% rename from debian/installer/s390x/modules/s390x/crc-modules rename to debian/installer/modules/s390x/crc-modules diff --git a/debian/installer/s390x/modules/s390x/crypto-dm-modules b/debian/installer/modules/s390x/crypto-dm-modules similarity index 100% rename from debian/installer/s390x/modules/s390x/crypto-dm-modules rename to debian/installer/modules/s390x/crypto-dm-modules diff --git a/debian/installer/s390x/modules/s390x/crypto-modules b/debian/installer/modules/s390x/crypto-modules similarity index 100% rename from debian/installer/s390x/modules/s390x/crypto-modules rename to debian/installer/modules/s390x/crypto-modules diff --git a/debian/installer/s390x/modules/s390x/dasd-extra-modules b/debian/installer/modules/s390x/dasd-extra-modules similarity index 100% rename from debian/installer/s390x/modules/s390x/dasd-extra-modules rename to debian/installer/modules/s390x/dasd-extra-modules diff --git a/debian/installer/s390x/modules/s390x/dasd-modules b/debian/installer/modules/s390x/dasd-modules similarity index 100% rename from debian/installer/s390x/modules/s390x/dasd-modules rename to debian/installer/modules/s390x/dasd-modules diff --git a/debian/installer/s390x/modules/s390x/ext4-modules b/debian/installer/modules/s390x/ext4-modules similarity index 100% rename from debian/installer/s390x/modules/s390x/ext4-modules rename to debian/installer/modules/s390x/ext4-modules diff --git a/debian/installer/s390x/modules/s390x/fat-modules b/debian/installer/modules/s390x/fat-modules similarity index 100% rename from debian/installer/s390x/modules/s390x/fat-modules rename to debian/installer/modules/s390x/fat-modules diff --git a/debian/installer/s390x/modules/s390x/fuse-modules b/debian/installer/modules/s390x/fuse-modules similarity index 100% rename from debian/installer/s390x/modules/s390x/fuse-modules rename to debian/installer/modules/s390x/fuse-modules diff --git a/debian/installer/s390x/modules/s390x/isofs-modules b/debian/installer/modules/s390x/isofs-modules similarity index 100% rename from debian/installer/s390x/modules/s390x/isofs-modules rename to debian/installer/modules/s390x/isofs-modules diff --git a/debian/installer/s390x/modules/s390x/kernel-image b/debian/installer/modules/s390x/kernel-image similarity index 100% rename from debian/installer/s390x/modules/s390x/kernel-image rename to debian/installer/modules/s390x/kernel-image diff --git a/debian/installer/s390x/modules/s390x/loop-modules b/debian/installer/modules/s390x/loop-modules similarity index 100% rename from debian/installer/s390x/modules/s390x/loop-modules rename to debian/installer/modules/s390x/loop-modules diff --git a/debian/installer/s390x/modules/s390x/md-modules b/debian/installer/modules/s390x/md-modules similarity index 100% rename from debian/installer/s390x/modules/s390x/md-modules rename to debian/installer/modules/s390x/md-modules diff --git a/debian/installer/s390x/modules/s390x/multipath-modules b/debian/installer/modules/s390x/multipath-modules similarity index 100% rename from debian/installer/s390x/modules/s390x/multipath-modules rename to debian/installer/modules/s390x/multipath-modules diff --git a/debian/installer/s390x/modules/s390x/nbd-modules b/debian/installer/modules/s390x/nbd-modules similarity index 100% rename from debian/installer/s390x/modules/s390x/nbd-modules rename to debian/installer/modules/s390x/nbd-modules diff --git a/debian/installer/s390x/modules/s390x/nic-modules b/debian/installer/modules/s390x/nic-modules similarity index 100% rename from debian/installer/s390x/modules/s390x/nic-modules rename to debian/installer/modules/s390x/nic-modules diff --git a/debian/installer/s390x/modules/s390x/scsi-core-modules b/debian/installer/modules/s390x/scsi-core-modules similarity index 100% rename from debian/installer/s390x/modules/s390x/scsi-core-modules rename to debian/installer/modules/s390x/scsi-core-modules diff --git a/debian/installer/s390x/modules/s390x/scsi-modules b/debian/installer/modules/s390x/scsi-modules similarity index 100% rename from debian/installer/s390x/modules/s390x/scsi-modules rename to debian/installer/modules/s390x/scsi-modules diff --git a/debian/installer/s390x/modules/s390x/udf-modules b/debian/installer/modules/s390x/udf-modules similarity index 100% rename from debian/installer/s390x/modules/s390x/udf-modules rename to debian/installer/modules/s390x/udf-modules diff --git a/debian/installer/s390x/modules/s390x/virtio-modules b/debian/installer/modules/s390x/virtio-modules similarity index 100% rename from debian/installer/s390x/modules/s390x/virtio-modules rename to debian/installer/modules/s390x/virtio-modules diff --git a/debian/installer/s390x/modules/s390x/xfs-modules b/debian/installer/modules/s390x/xfs-modules similarity index 100% rename from debian/installer/s390x/modules/s390x/xfs-modules rename to debian/installer/modules/s390x/xfs-modules diff --git a/debian/installer/s390x/modules/s390x/zlib-modules b/debian/installer/modules/s390x/zlib-modules similarity index 100% rename from debian/installer/s390x/modules/s390x/zlib-modules rename to debian/installer/modules/s390x/zlib-modules diff --git a/debian/installer/sh4/modules/sh4-sh7751r/btrfs-modules b/debian/installer/modules/sh4-sh7751r/btrfs-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7751r/btrfs-modules rename to debian/installer/modules/sh4-sh7751r/btrfs-modules diff --git a/debian/installer/sh4/modules/sh4-sh7751r/cdrom-core-modules b/debian/installer/modules/sh4-sh7751r/cdrom-core-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7751r/cdrom-core-modules rename to debian/installer/modules/sh4-sh7751r/cdrom-core-modules diff --git a/debian/installer/sh4/modules/sh4-sh7751r/compress-modules b/debian/installer/modules/sh4-sh7751r/compress-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7751r/compress-modules rename to debian/installer/modules/sh4-sh7751r/compress-modules diff --git a/debian/installer/sh4/modules/sh4-sh7751r/crc-modules b/debian/installer/modules/sh4-sh7751r/crc-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7751r/crc-modules rename to debian/installer/modules/sh4-sh7751r/crc-modules diff --git a/debian/installer/sh4/modules/sh4-sh7751r/crypto-dm-modules b/debian/installer/modules/sh4-sh7751r/crypto-dm-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7751r/crypto-dm-modules rename to debian/installer/modules/sh4-sh7751r/crypto-dm-modules diff --git a/debian/installer/sh4/modules/sh4-sh7751r/crypto-modules b/debian/installer/modules/sh4-sh7751r/crypto-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7751r/crypto-modules rename to debian/installer/modules/sh4-sh7751r/crypto-modules diff --git a/debian/installer/sh4/modules/sh4-sh7751r/ext4-modules b/debian/installer/modules/sh4-sh7751r/ext4-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7751r/ext4-modules rename to debian/installer/modules/sh4-sh7751r/ext4-modules diff --git a/debian/installer/sh4/modules/sh4-sh7751r/fat-modules b/debian/installer/modules/sh4-sh7751r/fat-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7751r/fat-modules rename to debian/installer/modules/sh4-sh7751r/fat-modules diff --git a/debian/installer/sh4/modules/sh4-sh7751r/firewire-core-modules b/debian/installer/modules/sh4-sh7751r/firewire-core-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7751r/firewire-core-modules rename to debian/installer/modules/sh4-sh7751r/firewire-core-modules diff --git a/debian/installer/sh4/modules/sh4-sh7751r/fuse-modules b/debian/installer/modules/sh4-sh7751r/fuse-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7751r/fuse-modules rename to debian/installer/modules/sh4-sh7751r/fuse-modules diff --git a/debian/installer/sh4/modules/sh4-sh7751r/i2c-modules b/debian/installer/modules/sh4-sh7751r/i2c-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7751r/i2c-modules rename to debian/installer/modules/sh4-sh7751r/i2c-modules diff --git a/debian/installer/sh4/modules/sh4-sh7751r/isofs-modules b/debian/installer/modules/sh4-sh7751r/isofs-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7751r/isofs-modules rename to debian/installer/modules/sh4-sh7751r/isofs-modules diff --git a/debian/installer/sh4/modules/sh4-sh7751r/jfs-modules b/debian/installer/modules/sh4-sh7751r/jfs-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7751r/jfs-modules rename to debian/installer/modules/sh4-sh7751r/jfs-modules diff --git a/debian/installer/sh4/modules/sh4-sh7751r/kernel-image b/debian/installer/modules/sh4-sh7751r/kernel-image similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7751r/kernel-image rename to debian/installer/modules/sh4-sh7751r/kernel-image diff --git a/debian/installer/sh4/modules/sh4-sh7751r/loop-modules b/debian/installer/modules/sh4-sh7751r/loop-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7751r/loop-modules rename to debian/installer/modules/sh4-sh7751r/loop-modules diff --git a/debian/installer/sh4/modules/sh4-sh7751r/md-modules b/debian/installer/modules/sh4-sh7751r/md-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7751r/md-modules rename to debian/installer/modules/sh4-sh7751r/md-modules diff --git a/debian/installer/sh4/modules/sh4-sh7751r/minix-modules b/debian/installer/modules/sh4-sh7751r/minix-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7751r/minix-modules rename to debian/installer/modules/sh4-sh7751r/minix-modules diff --git a/debian/installer/sh4/modules/sh4-sh7751r/multipath-modules b/debian/installer/modules/sh4-sh7751r/multipath-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7751r/multipath-modules rename to debian/installer/modules/sh4-sh7751r/multipath-modules diff --git a/debian/installer/sh4/modules/sh4-sh7751r/nbd-modules b/debian/installer/modules/sh4-sh7751r/nbd-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7751r/nbd-modules rename to debian/installer/modules/sh4-sh7751r/nbd-modules diff --git a/debian/installer/sh4/modules/sh4-sh7751r/nic-modules b/debian/installer/modules/sh4-sh7751r/nic-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7751r/nic-modules rename to debian/installer/modules/sh4-sh7751r/nic-modules diff --git a/debian/installer/sh4/modules/sh4-sh7751r/nic-shared-modules b/debian/installer/modules/sh4-sh7751r/nic-shared-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7751r/nic-shared-modules rename to debian/installer/modules/sh4-sh7751r/nic-shared-modules diff --git a/debian/installer/sh4/modules/sh4-sh7751r/nic-usb-modules b/debian/installer/modules/sh4-sh7751r/nic-usb-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7751r/nic-usb-modules rename to debian/installer/modules/sh4-sh7751r/nic-usb-modules diff --git a/debian/installer/sh4/modules/sh4-sh7751r/pata-modules b/debian/installer/modules/sh4-sh7751r/pata-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7751r/pata-modules rename to debian/installer/modules/sh4-sh7751r/pata-modules diff --git a/debian/installer/sh4/modules/sh4-sh7751r/ppp-modules b/debian/installer/modules/sh4-sh7751r/ppp-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7751r/ppp-modules rename to debian/installer/modules/sh4-sh7751r/ppp-modules diff --git a/debian/installer/sh4/modules/sh4-sh7751r/sata-modules b/debian/installer/modules/sh4-sh7751r/sata-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7751r/sata-modules rename to debian/installer/modules/sh4-sh7751r/sata-modules diff --git a/debian/installer/sh4/modules/sh4-sh7751r/sound-modules b/debian/installer/modules/sh4-sh7751r/sound-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7751r/sound-modules rename to debian/installer/modules/sh4-sh7751r/sound-modules diff --git a/debian/installer/sh4/modules/sh4-sh7751r/speakup-modules b/debian/installer/modules/sh4-sh7751r/speakup-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7751r/speakup-modules rename to debian/installer/modules/sh4-sh7751r/speakup-modules diff --git a/debian/installer/sh4/modules/sh4-sh7751r/squashfs-modules b/debian/installer/modules/sh4-sh7751r/squashfs-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7751r/squashfs-modules rename to debian/installer/modules/sh4-sh7751r/squashfs-modules diff --git a/debian/installer/sh4/modules/sh4-sh7751r/udf-modules b/debian/installer/modules/sh4-sh7751r/udf-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7751r/udf-modules rename to debian/installer/modules/sh4-sh7751r/udf-modules diff --git a/debian/installer/sh4/modules/sh4-sh7751r/usb-serial-modules b/debian/installer/modules/sh4-sh7751r/usb-serial-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7751r/usb-serial-modules rename to debian/installer/modules/sh4-sh7751r/usb-serial-modules diff --git a/debian/installer/sh4/modules/sh4-sh7751r/usb-storage-modules b/debian/installer/modules/sh4-sh7751r/usb-storage-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7751r/usb-storage-modules rename to debian/installer/modules/sh4-sh7751r/usb-storage-modules diff --git a/debian/installer/sh4/modules/sh4-sh7751r/virtio-modules b/debian/installer/modules/sh4-sh7751r/virtio-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7751r/virtio-modules rename to debian/installer/modules/sh4-sh7751r/virtio-modules diff --git a/debian/installer/sh4/modules/sh4-sh7751r/xfs-modules b/debian/installer/modules/sh4-sh7751r/xfs-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7751r/xfs-modules rename to debian/installer/modules/sh4-sh7751r/xfs-modules diff --git a/debian/installer/sh4/modules/sh4-sh7751r/zlib-modules b/debian/installer/modules/sh4-sh7751r/zlib-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7751r/zlib-modules rename to debian/installer/modules/sh4-sh7751r/zlib-modules diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/btrfs-modules b/debian/installer/modules/sh4-sh7785lcr/btrfs-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7785lcr/btrfs-modules rename to debian/installer/modules/sh4-sh7785lcr/btrfs-modules diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/cdrom-core-modules b/debian/installer/modules/sh4-sh7785lcr/cdrom-core-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7785lcr/cdrom-core-modules rename to debian/installer/modules/sh4-sh7785lcr/cdrom-core-modules diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/compress-modules b/debian/installer/modules/sh4-sh7785lcr/compress-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7785lcr/compress-modules rename to debian/installer/modules/sh4-sh7785lcr/compress-modules diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/crc-modules b/debian/installer/modules/sh4-sh7785lcr/crc-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7785lcr/crc-modules rename to debian/installer/modules/sh4-sh7785lcr/crc-modules diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/crypto-dm-modules b/debian/installer/modules/sh4-sh7785lcr/crypto-dm-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7785lcr/crypto-dm-modules rename to debian/installer/modules/sh4-sh7785lcr/crypto-dm-modules diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/crypto-modules b/debian/installer/modules/sh4-sh7785lcr/crypto-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7785lcr/crypto-modules rename to debian/installer/modules/sh4-sh7785lcr/crypto-modules diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/ext4-modules b/debian/installer/modules/sh4-sh7785lcr/ext4-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7785lcr/ext4-modules rename to debian/installer/modules/sh4-sh7785lcr/ext4-modules diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/fat-modules b/debian/installer/modules/sh4-sh7785lcr/fat-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7785lcr/fat-modules rename to debian/installer/modules/sh4-sh7785lcr/fat-modules diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/firewire-core-modules b/debian/installer/modules/sh4-sh7785lcr/firewire-core-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7785lcr/firewire-core-modules rename to debian/installer/modules/sh4-sh7785lcr/firewire-core-modules diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/fuse-modules b/debian/installer/modules/sh4-sh7785lcr/fuse-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7785lcr/fuse-modules rename to debian/installer/modules/sh4-sh7785lcr/fuse-modules diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/isofs-modules b/debian/installer/modules/sh4-sh7785lcr/isofs-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7785lcr/isofs-modules rename to debian/installer/modules/sh4-sh7785lcr/isofs-modules diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/jfs-modules b/debian/installer/modules/sh4-sh7785lcr/jfs-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7785lcr/jfs-modules rename to debian/installer/modules/sh4-sh7785lcr/jfs-modules diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/kernel-image b/debian/installer/modules/sh4-sh7785lcr/kernel-image similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7785lcr/kernel-image rename to debian/installer/modules/sh4-sh7785lcr/kernel-image diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/loop-modules b/debian/installer/modules/sh4-sh7785lcr/loop-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7785lcr/loop-modules rename to debian/installer/modules/sh4-sh7785lcr/loop-modules diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/md-modules b/debian/installer/modules/sh4-sh7785lcr/md-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7785lcr/md-modules rename to debian/installer/modules/sh4-sh7785lcr/md-modules diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/minix-modules b/debian/installer/modules/sh4-sh7785lcr/minix-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7785lcr/minix-modules rename to debian/installer/modules/sh4-sh7785lcr/minix-modules diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/multipath-modules b/debian/installer/modules/sh4-sh7785lcr/multipath-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7785lcr/multipath-modules rename to debian/installer/modules/sh4-sh7785lcr/multipath-modules diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/nbd-modules b/debian/installer/modules/sh4-sh7785lcr/nbd-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7785lcr/nbd-modules rename to debian/installer/modules/sh4-sh7785lcr/nbd-modules diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/nic-modules b/debian/installer/modules/sh4-sh7785lcr/nic-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7785lcr/nic-modules rename to debian/installer/modules/sh4-sh7785lcr/nic-modules diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/nic-shared-modules b/debian/installer/modules/sh4-sh7785lcr/nic-shared-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7785lcr/nic-shared-modules rename to debian/installer/modules/sh4-sh7785lcr/nic-shared-modules diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/nic-usb-modules b/debian/installer/modules/sh4-sh7785lcr/nic-usb-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7785lcr/nic-usb-modules rename to debian/installer/modules/sh4-sh7785lcr/nic-usb-modules diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/pata-modules b/debian/installer/modules/sh4-sh7785lcr/pata-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7785lcr/pata-modules rename to debian/installer/modules/sh4-sh7785lcr/pata-modules diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/ppp-modules b/debian/installer/modules/sh4-sh7785lcr/ppp-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7785lcr/ppp-modules rename to debian/installer/modules/sh4-sh7785lcr/ppp-modules diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/sata-modules b/debian/installer/modules/sh4-sh7785lcr/sata-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7785lcr/sata-modules rename to debian/installer/modules/sh4-sh7785lcr/sata-modules diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/sound-modules b/debian/installer/modules/sh4-sh7785lcr/sound-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7785lcr/sound-modules rename to debian/installer/modules/sh4-sh7785lcr/sound-modules diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/speakup-modules b/debian/installer/modules/sh4-sh7785lcr/speakup-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7785lcr/speakup-modules rename to debian/installer/modules/sh4-sh7785lcr/speakup-modules diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/squashfs-modules b/debian/installer/modules/sh4-sh7785lcr/squashfs-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7785lcr/squashfs-modules rename to debian/installer/modules/sh4-sh7785lcr/squashfs-modules diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/udf-modules b/debian/installer/modules/sh4-sh7785lcr/udf-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7785lcr/udf-modules rename to debian/installer/modules/sh4-sh7785lcr/udf-modules diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/usb-serial-modules b/debian/installer/modules/sh4-sh7785lcr/usb-serial-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7785lcr/usb-serial-modules rename to debian/installer/modules/sh4-sh7785lcr/usb-serial-modules diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/xfs-modules b/debian/installer/modules/sh4-sh7785lcr/xfs-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7785lcr/xfs-modules rename to debian/installer/modules/sh4-sh7785lcr/xfs-modules diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/zlib-modules b/debian/installer/modules/sh4-sh7785lcr/zlib-modules similarity index 100% rename from debian/installer/sh4/modules/sh4-sh7785lcr/zlib-modules rename to debian/installer/modules/sh4-sh7785lcr/zlib-modules diff --git a/debian/installer/sparc64/modules/sparc64/ata-modules b/debian/installer/modules/sparc64/ata-modules similarity index 100% rename from debian/installer/sparc64/modules/sparc64/ata-modules rename to debian/installer/modules/sparc64/ata-modules diff --git a/debian/installer/sparc64/modules/sparc64/btrfs-modules b/debian/installer/modules/sparc64/btrfs-modules similarity index 100% rename from debian/installer/sparc64/modules/sparc64/btrfs-modules rename to debian/installer/modules/sparc64/btrfs-modules diff --git a/debian/installer/sparc64/modules/sparc64/cdrom-core-modules b/debian/installer/modules/sparc64/cdrom-core-modules similarity index 100% rename from debian/installer/sparc64/modules/sparc64/cdrom-core-modules rename to debian/installer/modules/sparc64/cdrom-core-modules diff --git a/debian/installer/sparc64/modules/sparc64/compress-modules b/debian/installer/modules/sparc64/compress-modules similarity index 100% rename from debian/installer/sparc64/modules/sparc64/compress-modules rename to debian/installer/modules/sparc64/compress-modules diff --git a/debian/installer/sparc64/modules/sparc64/crc-modules b/debian/installer/modules/sparc64/crc-modules similarity index 100% rename from debian/installer/sparc64/modules/sparc64/crc-modules rename to debian/installer/modules/sparc64/crc-modules diff --git a/debian/installer/sparc64/modules/sparc64/crypto-dm-modules b/debian/installer/modules/sparc64/crypto-dm-modules similarity index 100% rename from debian/installer/sparc64/modules/sparc64/crypto-dm-modules rename to debian/installer/modules/sparc64/crypto-dm-modules diff --git a/debian/installer/sparc64/modules/sparc64/crypto-modules b/debian/installer/modules/sparc64/crypto-modules similarity index 100% rename from debian/installer/sparc64/modules/sparc64/crypto-modules rename to debian/installer/modules/sparc64/crypto-modules diff --git a/debian/installer/sparc64/modules/sparc64/ext4-modules b/debian/installer/modules/sparc64/ext4-modules similarity index 100% rename from debian/installer/sparc64/modules/sparc64/ext4-modules rename to debian/installer/modules/sparc64/ext4-modules diff --git a/debian/installer/sparc64/modules/sparc64/fat-modules b/debian/installer/modules/sparc64/fat-modules similarity index 100% rename from debian/installer/sparc64/modules/sparc64/fat-modules rename to debian/installer/modules/sparc64/fat-modules diff --git a/debian/installer/sparc64/modules/sparc64/fuse-modules b/debian/installer/modules/sparc64/fuse-modules similarity index 100% rename from debian/installer/sparc64/modules/sparc64/fuse-modules rename to debian/installer/modules/sparc64/fuse-modules diff --git a/debian/installer/sparc64/modules/sparc64/input-modules b/debian/installer/modules/sparc64/input-modules similarity index 100% rename from debian/installer/sparc64/modules/sparc64/input-modules rename to debian/installer/modules/sparc64/input-modules diff --git a/debian/installer/sparc64/modules/sparc64/isofs-modules b/debian/installer/modules/sparc64/isofs-modules similarity index 100% rename from debian/installer/sparc64/modules/sparc64/isofs-modules rename to debian/installer/modules/sparc64/isofs-modules diff --git a/debian/installer/sparc64/modules/sparc64/jfs-modules b/debian/installer/modules/sparc64/jfs-modules similarity index 100% rename from debian/installer/sparc64/modules/sparc64/jfs-modules rename to debian/installer/modules/sparc64/jfs-modules diff --git a/debian/installer/sparc64/modules/sparc64/kernel-image b/debian/installer/modules/sparc64/kernel-image similarity index 100% rename from debian/installer/sparc64/modules/sparc64/kernel-image rename to debian/installer/modules/sparc64/kernel-image diff --git a/debian/installer/sparc64/modules/sparc64/md-modules b/debian/installer/modules/sparc64/md-modules similarity index 100% rename from debian/installer/sparc64/modules/sparc64/md-modules rename to debian/installer/modules/sparc64/md-modules diff --git a/debian/installer/sparc64/modules/sparc64/multipath-modules b/debian/installer/modules/sparc64/multipath-modules similarity index 100% rename from debian/installer/sparc64/modules/sparc64/multipath-modules rename to debian/installer/modules/sparc64/multipath-modules diff --git a/debian/installer/sparc64/modules/sparc64/nbd-modules b/debian/installer/modules/sparc64/nbd-modules similarity index 100% rename from debian/installer/sparc64/modules/sparc64/nbd-modules rename to debian/installer/modules/sparc64/nbd-modules diff --git a/debian/installer/sparc64/modules/sparc64/nic-modules b/debian/installer/modules/sparc64/nic-modules similarity index 100% rename from debian/installer/sparc64/modules/sparc64/nic-modules rename to debian/installer/modules/sparc64/nic-modules diff --git a/debian/installer/sparc64/modules/sparc64/pata-modules b/debian/installer/modules/sparc64/pata-modules similarity index 100% rename from debian/installer/sparc64/modules/sparc64/pata-modules rename to debian/installer/modules/sparc64/pata-modules diff --git a/debian/installer/sparc64/modules/sparc64/ppp-modules b/debian/installer/modules/sparc64/ppp-modules similarity index 100% rename from debian/installer/sparc64/modules/sparc64/ppp-modules rename to debian/installer/modules/sparc64/ppp-modules diff --git a/debian/installer/sparc64/modules/sparc64/sata-modules b/debian/installer/modules/sparc64/sata-modules similarity index 100% rename from debian/installer/sparc64/modules/sparc64/sata-modules rename to debian/installer/modules/sparc64/sata-modules diff --git a/debian/installer/sparc64/modules/sparc64/scsi-core-modules b/debian/installer/modules/sparc64/scsi-core-modules similarity index 100% rename from debian/installer/sparc64/modules/sparc64/scsi-core-modules rename to debian/installer/modules/sparc64/scsi-core-modules diff --git a/debian/installer/sparc64/modules/sparc64/scsi-modules b/debian/installer/modules/sparc64/scsi-modules similarity index 100% rename from debian/installer/sparc64/modules/sparc64/scsi-modules rename to debian/installer/modules/sparc64/scsi-modules diff --git a/debian/installer/sparc64/modules/sparc64/squashfs-modules b/debian/installer/modules/sparc64/squashfs-modules similarity index 100% rename from debian/installer/sparc64/modules/sparc64/squashfs-modules rename to debian/installer/modules/sparc64/squashfs-modules diff --git a/debian/installer/sparc64/modules/sparc64/udf-modules b/debian/installer/modules/sparc64/udf-modules similarity index 100% rename from debian/installer/sparc64/modules/sparc64/udf-modules rename to debian/installer/modules/sparc64/udf-modules diff --git a/debian/installer/sparc64/modules/sparc64/ufs-modules b/debian/installer/modules/sparc64/ufs-modules similarity index 100% rename from debian/installer/sparc64/modules/sparc64/ufs-modules rename to debian/installer/modules/sparc64/ufs-modules diff --git a/debian/installer/sparc64/modules/sparc64/usb-modules b/debian/installer/modules/sparc64/usb-modules similarity index 100% rename from debian/installer/sparc64/modules/sparc64/usb-modules rename to debian/installer/modules/sparc64/usb-modules diff --git a/debian/installer/sparc64/modules/sparc64/usb-storage-modules b/debian/installer/modules/sparc64/usb-storage-modules similarity index 100% rename from debian/installer/sparc64/modules/sparc64/usb-storage-modules rename to debian/installer/modules/sparc64/usb-storage-modules diff --git a/debian/installer/sparc64/modules/sparc64/virtio-modules b/debian/installer/modules/sparc64/virtio-modules similarity index 100% rename from debian/installer/sparc64/modules/sparc64/virtio-modules rename to debian/installer/modules/sparc64/virtio-modules diff --git a/debian/installer/sparc64/modules/sparc64/xfs-modules b/debian/installer/modules/sparc64/xfs-modules similarity index 100% rename from debian/installer/sparc64/modules/sparc64/xfs-modules rename to debian/installer/modules/sparc64/xfs-modules diff --git a/debian/installer/sparc64/modules/sparc64/zlib-modules b/debian/installer/modules/sparc64/zlib-modules similarity index 100% rename from debian/installer/sparc64/modules/sparc64/zlib-modules rename to debian/installer/modules/sparc64/zlib-modules diff --git a/debian/installer/package-list b/debian/installer/package-list index 8fb6a3158..c1b38e3c9 100644 --- a/debian/installer/package-list +++ b/debian/installer/package-list @@ -3,6 +3,22 @@ # architecture, which is derived from the files in the modules directory. # Package: kernel-image +Provides_amd64: zlib-modules +Provides_arm64: zlib-modules +Provides_armel: rtc-modules +Provides_i386: rtc-modules, zlib-modules +Provides_ia64: efi-modules, zlib-modules +Provides_loongson-3: i2c-modules, rtc-modules +Provides_mips: rtc-modules +Provides_mips64: rtc-modules +Provides_mips64el: rtc-modules +Provides_mips64r6: rtc-modules +Provides_mips64r6el: rtc-modules +Provides_mipsel: rtc-modules +Provides_mipsr6: rtc-modules +Provides_mipsr6el: rtc-modules +Provides_parisc64-smp: i2c-modules +Provides_sh4: event-modules, fb-modules, input-modules, mouse-modules, nic-shared-modules, rtc-modules, uinput-modules, usb-modules Priority: standard Description: Linux kernel image and core modules for the Debian installer This package contains the kernel image and core modules for the Debian @@ -33,6 +49,7 @@ Description: Shared NIC drivers Package: serial-modules Depends: kernel-image, pcmcia-modules +Depends_ia64: kernel-image, pcmcia-modules, sn-modules Priority: optional Description: Serial drivers This package contains serial drivers for the kernel. @@ -51,12 +68,17 @@ Description: PPP drivers Package: pata-modules Depends: kernel-image, ata-modules +Depends_alpha: kernel-image, ata-modules, scsi-core-modules +Depends_hppa: kernel-image, ata-modules, scsi-core-modules Priority: standard +Priority_armhf: optional Description: PATA drivers This package contains PATA drivers for the kernel. Package: cdrom-core-modules Depends: kernel-image, scsi-core-modules, isofs-modules +Depends_ia64: kernel-image, scsi-core-modules, ide-modules, isofs-modules +Depends_m68k: kernel-image, scsi-core-modules, ide-modules Priority: standard Description: CDROM support This package contains core CDROM support for the kernel. @@ -112,7 +134,7 @@ Description: ISOFS filesystem support This package contains the ISOFS filesystem module for the kernel. Package: jffs2-modules -Depends: kernel-image, zlib-modules, compress-modules +Depends: kernel-image, zlib-modules, compress-modules, mtd-modules Priority: optional Description: JFFS2 filesystem support This package contains the JFFS2 filesystem module for the kernel. @@ -144,6 +166,9 @@ Description: XFS filesystem support Package: fat-modules Depends: kernel-image Priority: optional +Priority_amd64: standard +Priority_i386: standard +Priority_ia64: standard Description: FAT filesystem support This package contains the FAT and VFAT filesystem modules for the kernel. @@ -191,6 +216,8 @@ Description: USB support Package: usb-storage-modules Depends: kernel-image, scsi-core-modules, usb-modules +Depends_alpha: kernel-image, scsi-modules, usb-modules +Depends_hppa: kernel-image, scsi-modules, usb-modules Priority: standard Description: USB storage support This package contains the USB storage driver for the kernel. @@ -203,7 +230,9 @@ Description: PCMCIA storage drivers Package: fb-modules Depends: kernel-image, i2c-modules +Depends_armel: kernel-image, usb-modules Priority: optional +Priority_hppa: standard Description: Frame buffer support This package contains Frame buffer drivers for the kernel. @@ -227,6 +256,7 @@ Description: Mouse support Package: nic-pcmcia-modules Depends: kernel-image, nic-shared-modules, nic-wireless-modules, pcmcia-modules, mmc-core-modules +Depends_powerpc: kernel-image, nic-modules, nic-shared-modules, pcmcia-modules Priority: standard Description: Common PCMCIA NIC drivers This package contains common PCMCIA NIC drivers for the kernel. @@ -389,3 +419,56 @@ Depends: kernel-image Priority: optional Description: MTD modules This package contains MTD modules. + +Package: srm-modules +Depends: kernel-image +Priority: standard +Description: SRM modules + This package contains the srm_env module which provides access to the SRM + environment. + +Package: ide-core-modules +Depends: kernel-image +Priority: standard +Description: IDE support + This package contains core IDE support for the kernel. + +Package: ide-modules +Depends: kernel-image, ide-core-modules, sn-modules +Priority: standard +Description: IDE drivers + This package contains IDE drivers for the kernel. + +Package: sn-modules +Depends: kernel-image +Priority: extra +Description: SN modules + This package contains SN modules for Altix systems + +Package: hypervisor-modules +Depends: kernel-image +Priority: standard +Description: IBM 64bit hypervisor console modules + Contains drivers for the hypervisor console, used as console for linux + running in logical partitions of IBM hardware supporting it. + +Package: fancontrol-modules +Depends: kernel-image +Priority: standard +Description: Apple powermac fancontrol modules + Contains drivers for macintosh i2c bus as well as for the monitoring devices + connected to it. This allows to control the fans during installation. + +Package: dasd-modules +Depends: kernel-image +Priority: standard +Description: dasd modules + This package contains dasd modules. + +Package: dasd-extra-modules +Depends: kernel-image, dasd-modules +Priority: optional +Description: optional dasd DIAG support + This package contains the module for dasd DIAG support. The udeb is + not loaded by default as the installer does not actually support this. + It can however be useful to have available in rescue situations. diff --git a/debian/installer/powerpc/kernel-versions b/debian/installer/powerpc/kernel-versions deleted file mode 100644 index 50cf2120a..000000000 --- a/debian/installer/powerpc/kernel-versions +++ /dev/null @@ -1,3 +0,0 @@ -# arch version flavour installedname suffix build-depends -powerpc - powerpc - - - -powerpc - powerpc64 - - - diff --git a/debian/installer/powerpc/package-list b/debian/installer/powerpc/package-list deleted file mode 100644 index 798bdf521..000000000 --- a/debian/installer/powerpc/package-list +++ /dev/null @@ -1,25 +0,0 @@ -# This file is used to build up the control file. The kernel version and -# "-di" are appended to the package names. Section can be left out. So can -# architecture, which is derived from the files in the modules directory. -# It overwrites specifications from /usr/share/kernel-wedge/package-list. -# - -Package: pata-modules -Depends: kernel-image, ata-modules, core-modules - -Package: nic-pcmcia-modules -Depends: kernel-image, nic-modules, nic-shared-modules, nic-wireless-modules, pcmcia-modules, core-modules - -Package: hypervisor-modules -Depends: kernel-image -Priority: standard -Description: IBM 64bit hypervisor console modules - Contains drivers for the hypervisor console, used as console for linux - running in logical partitions of IBM hardware supporting it. - -Package: fancontrol-modules -Depends: kernel-image -Priority: standard -Description: Apple powermac fancontrol modules - Contains drivers for macintosh i2c bus as well as for the monitoring devices - connected to it. This allows to control the fans during installation. diff --git a/debian/installer/ppc64/kernel-versions b/debian/installer/ppc64/kernel-versions deleted file mode 100644 index 359bd103c..000000000 --- a/debian/installer/ppc64/kernel-versions +++ /dev/null @@ -1,2 +0,0 @@ -# arch version flavour installedname suffix build-depends -ppc64 - powerpc64 - - - diff --git a/debian/installer/ppc64/modules/powerpc b/debian/installer/ppc64/modules/powerpc deleted file mode 120000 index 207f2439c..000000000 --- a/debian/installer/ppc64/modules/powerpc +++ /dev/null @@ -1 +0,0 @@ -../../powerpc/modules/powerpc \ No newline at end of file diff --git a/debian/installer/ppc64/modules/ppc64 b/debian/installer/ppc64/modules/ppc64 deleted file mode 120000 index f007b6a78..000000000 --- a/debian/installer/ppc64/modules/ppc64 +++ /dev/null @@ -1 +0,0 @@ -../../powerpc/modules/powerpc-powerpc64 \ No newline at end of file diff --git a/debian/installer/ppc64/package-list b/debian/installer/ppc64/package-list deleted file mode 120000 index d57167602..000000000 --- a/debian/installer/ppc64/package-list +++ /dev/null @@ -1 +0,0 @@ -../powerpc/package-list \ No newline at end of file diff --git a/debian/installer/ppc64el/kernel-versions b/debian/installer/ppc64el/kernel-versions deleted file mode 100644 index 5f0d460d3..000000000 --- a/debian/installer/ppc64el/kernel-versions +++ /dev/null @@ -1,2 +0,0 @@ -# arch version flavour installedname suffix build-depends -ppc64el - powerpc64le - - - diff --git a/debian/installer/ppc64el/package-list b/debian/installer/ppc64el/package-list deleted file mode 120000 index a872ee13e..000000000 --- a/debian/installer/ppc64el/package-list +++ /dev/null @@ -1 +0,0 @@ -../ppc64/package-list \ No newline at end of file diff --git a/debian/installer/s390x/kernel-versions b/debian/installer/s390x/kernel-versions deleted file mode 100644 index bbe139d5a..000000000 --- a/debian/installer/s390x/kernel-versions +++ /dev/null @@ -1,2 +0,0 @@ -# arch version flavour installedname suffix build-depends -s390x - s390x - - - diff --git a/debian/installer/s390x/package-list b/debian/installer/s390x/package-list deleted file mode 100644 index 4744d084a..000000000 --- a/debian/installer/s390x/package-list +++ /dev/null @@ -1,19 +0,0 @@ -# This file is used to build up the control file. The kernel version and -# "-di" are appended to the package names. Section can be left out. So can -# architecture, which is derived from the files in the modules directory. -# It overwrites specifications from /usr/share/kernel-wedge/package-list. -# - -Package: dasd-modules -Depends: kernel-image -Priority: standard -Description: dasd modules - This package contains dasd modules. - -Package: dasd-extra-modules -Depends: kernel-image, dasd-modules -Priority: optional -Description: optional dasd DIAG support - This package contains the module for dasd DIAG support. The udeb is - not loaded by default as the installer does not actually support this. - It can however be useful to have available in rescue situations. diff --git a/debian/installer/sh4/kernel-versions b/debian/installer/sh4/kernel-versions deleted file mode 100644 index b39e3cfb6..000000000 --- a/debian/installer/sh4/kernel-versions +++ /dev/null @@ -1,3 +0,0 @@ -# arch version flavour installedname suffix build-depends -sh4 - sh7751r - y - -sh4 - sh7785lcr - y - diff --git a/debian/installer/sh4/package-list b/debian/installer/sh4/package-list deleted file mode 100644 index 934de9c7f..000000000 --- a/debian/installer/sh4/package-list +++ /dev/null @@ -1,7 +0,0 @@ -# This file is used to build up the control file. The kernel version and -# "-di" are appended to the package names. Section can be left out. So can -# architecture, which is derived from the files in the modules directory. -# It overwrites specifications from /usr/share/kernel-wedge/package-list. -# -Package: kernel-image -Provides: event-modules, fb-modules, input-modules, mouse-modules, nic-shared-modules, rtc-modules, uinput-modules, usb-modules diff --git a/debian/installer/sparc64/kernel-versions b/debian/installer/sparc64/kernel-versions deleted file mode 100644 index 481193386..000000000 --- a/debian/installer/sparc64/kernel-versions +++ /dev/null @@ -1,2 +0,0 @@ -# arch version flavour installedname suffix build-depends -sparc64 - sparc64 - y - diff --git a/debian/installer/sparc64/package-list b/debian/installer/sparc64/package-list deleted file mode 100644 index 1e5e2f638..000000000 --- a/debian/installer/sparc64/package-list +++ /dev/null @@ -1,15 +0,0 @@ -# This file is used to build up the control file. The kernel version and -# "-di" are appended to the package names. Section can be left out. So can -# architecture, which is derived from the files in the modules directory. -# It overwrites specifications from /usr/share/kernel-wedge/package-list. -# - -Package: nic-modules -Priority: standard -Description: Network card modules for Sparc kernels - This package contains the drivers for the Happy Meal/Big Mac 10/100BaseT, - Sun QuadEthernet and MyriCOM Gigabit Ethernet SBus devices for SPARC - systems, as well as various PCI NIC drivers (only on sparc64.) - . - Do not install this package on a real Debian system! You probably - want a kernel-image package instead. diff --git a/debian/rules b/debian/rules index 9059d78d2..90973714a 100755 --- a/debian/rules +++ b/debian/rules @@ -92,7 +92,7 @@ clean: debian/control CONTROL_FILES = debian/changelog $(wildcard debian/templates/*.in) CONTROL_FILES += debian/config/defines $(wildcard debian/config/*/defines) $(wildcard debian/config/*/*/defines) -CONTROL_FILES += $(wildcard debian/installer/*/kernel-versions) $(wildcard debian/installer/*/package-list) debian/installer/package-list +CONTROL_FILES += debian/installer/kernel-versions debian/installer/package-list debian/control debian/rules.gen: debian/bin/gencontrol.py $(CONTROL_FILES) ifeq ($(wildcard debian/control.md5sum),) $(MAKE) -f debian/rules debian/control-real diff --git a/debian/rules.real b/debian/rules.real index 8e5d937ed..4e7f5c972 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -547,7 +547,7 @@ install-signed-template_$(ARCH): dh_builddeb install-udeb_$(ARCH): export KW_DEFCONFIG_DIR=debian/installer -install-udeb_$(ARCH): export KW_CONFIG_DIR=debian/installer/$(ARCH) +install-udeb_$(ARCH): export KW_CONFIG_DIR=debian/installer install-udeb_$(ARCH): DH_OPTIONS=$(PACKAGE_NAMES:%=-p%) ifeq ($(UDEB_UNSIGNED_TEST_BUILD),True) install-udeb_$(ARCH): export DEB_BUILD_PROFILES=pkg.linux.udeb-unsigned-test-build diff --git a/debian/signing_templates/control.source.in b/debian/signing_templates/control.source.in index 3ef7f3381..6e0870e31 100644 --- a/debian/signing_templates/control.source.in +++ b/debian/signing_templates/control.source.in @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian Kernel Team Uploaders: Ben Hutchings Standards-Version: 4.1.1 -Build-Depends: debhelper (>= 10.1~), rsync, sbsigntool [amd64 arm64 i386], kernel-wedge (>= 2.93~), linux-kbuild-@version@ +Build-Depends: debhelper (>= 10.1~), rsync, sbsigntool [amd64 arm64 i386], kernel-wedge (>= 2.99~), linux-kbuild-@version@ Rules-Requires-Root: no Vcs-Git: https://salsa.debian.org/kernel-team/linux.git Vcs-Browser: https://salsa.debian.org/kernel-team/linux diff --git a/debian/signing_templates/rules.real b/debian/signing_templates/rules.real index 4d08ef77c..dbb1a33a3 100644 --- a/debian/signing_templates/rules.real +++ b/debian/signing_templates/rules.real @@ -59,7 +59,7 @@ install-signed: dh_builddeb install-udeb_$(ARCH): export KW_DEFCONFIG_DIR=/usr/share/linux-support-$(ABINAME)/installer -install-udeb_$(ARCH): export KW_CONFIG_DIR=/usr/share/linux-support-$(ABINAME)/installer/$(ARCH) +install-udeb_$(ARCH): export KW_CONFIG_DIR=/usr/share/linux-support-$(ABINAME)/installer install-udeb_$(ARCH): DH_OPTIONS=$(PACKAGE_NAMES:%=-p%) install-udeb_$(ARCH): dh_testdir diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in index 8dbba4685..7b45002e5 100644 --- a/debian/templates/control.source.in +++ b/debian/templates/control.source.in @@ -19,7 +19,7 @@ Build-Depends: bison , flex (>= 2.6.1-1.1~) , Build-Depends-Arch: # used by debian/rules.real to build udebs - kernel-wedge (>= 2.93~) , + kernel-wedge (>= 2.99~) , # used by kernel-wedge (only on Linux, thus not declared as a dependency) kmod , # used by upstream to build include/generated/timeconst.h