From 0a2446edf715db39c69acd409eac8711390503a3 Mon Sep 17 00:00:00 2001 From: Ciro Santilli Date: Fri, 7 Sep 2018 17:25:47 +0100 Subject: [PATCH] shorter names for kernel and buildroot dirs --- build | 4 ++-- {buildroot_config_fragments => buildroot_config}/default | 0 {buildroot_config_fragments => buildroot_config}/gpio | 0 {buildroot_config_fragments => buildroot_config}/kmscube | 0 {buildroot_config_fragments => buildroot_config}/x11 | 0 {kernel_config_fragments => kernel_config}/default | 0 {kernel_config_fragments => kernel_config}/display | 0 {kernel_config_fragments => kernel_config}/gpio | 0 {kernel_config_fragments => kernel_config}/leds | 0 {kernel_config_fragments => kernel_config}/min | 0 10 files changed, 2 insertions(+), 2 deletions(-) rename {buildroot_config_fragments => buildroot_config}/default (100%) rename {buildroot_config_fragments => buildroot_config}/gpio (100%) rename {buildroot_config_fragments => buildroot_config}/kmscube (100%) rename {buildroot_config_fragments => buildroot_config}/x11 (100%) rename {kernel_config_fragments => kernel_config}/default (100%) rename {kernel_config_fragments => kernel_config}/display (100%) rename {kernel_config_fragments => kernel_config}/gpio (100%) rename {kernel_config_fragments => kernel_config}/leds (100%) rename {kernel_config_fragments => kernel_config}/min (100%) diff --git a/build b/build index e279da9..8ca66c9 100755 --- a/build +++ b/build @@ -110,7 +110,7 @@ def main(args, extra_args=None): 'BR2_TARGET_ROOTFS_INITRAMFS=n', ]) buildroot_config_fragments = [ - os.path.join(common.root_dir, 'buildroot_config_fragments', 'default') + os.path.join(common.root_dir, 'buildroot_config', 'default') ] + args.buildroot_config_fragment # Decide kernel configuration. @@ -145,7 +145,7 @@ def main(args, extra_args=None): raise Exception('Kernel config fragment file does not exist: {}'.format(args.kernel_custom_config_file)) default_kernel_config_fragments = [] else: - kernel_config_fragment_dir = os.path.join(common.root_dir, 'kernel_config_fragments') + kernel_config_fragment_dir = os.path.join(common.root_dir, 'kernel_config') default_kernel_config_fragments = ['min'] if args.linux_reconfigure: # https://stackoverflow.com/questions/49260466/why-when-i-change-br2-linux-kernel-custom-config-file-and-run-make-linux-reconfi diff --git a/buildroot_config_fragments/default b/buildroot_config/default similarity index 100% rename from buildroot_config_fragments/default rename to buildroot_config/default diff --git a/buildroot_config_fragments/gpio b/buildroot_config/gpio similarity index 100% rename from buildroot_config_fragments/gpio rename to buildroot_config/gpio diff --git a/buildroot_config_fragments/kmscube b/buildroot_config/kmscube similarity index 100% rename from buildroot_config_fragments/kmscube rename to buildroot_config/kmscube diff --git a/buildroot_config_fragments/x11 b/buildroot_config/x11 similarity index 100% rename from buildroot_config_fragments/x11 rename to buildroot_config/x11 diff --git a/kernel_config_fragments/default b/kernel_config/default similarity index 100% rename from kernel_config_fragments/default rename to kernel_config/default diff --git a/kernel_config_fragments/display b/kernel_config/display similarity index 100% rename from kernel_config_fragments/display rename to kernel_config/display diff --git a/kernel_config_fragments/gpio b/kernel_config/gpio similarity index 100% rename from kernel_config_fragments/gpio rename to kernel_config/gpio diff --git a/kernel_config_fragments/leds b/kernel_config/leds similarity index 100% rename from kernel_config_fragments/leds rename to kernel_config/leds diff --git a/kernel_config_fragments/min b/kernel_config/min similarity index 100% rename from kernel_config_fragments/min rename to kernel_config/min