From 8e51e180eecec74cb63d8aec3362e60c58cd2f14 Mon Sep 17 00:00:00 2001 From: mudler Date: Wed, 31 Aug 2016 15:00:47 +0200 Subject: [PATCH] rename odroid-x2-u2 --- .../sd_fuse/bl1.HardKernel | Bin .../sd_fuse/bl2.HardKernel | Bin .../sd_fuse/sd_fusing.sh | 0 .../sd_fuse/tzsw.HardKernel | Bin boot/arm/{odroid-u2-x2 => odroid-x2-u2}/u-boot.bin | Bin build.sh | 4 ++-- ...-x2-8G.spec => sabayon-arm-odroid-x2-u2-8G.spec} | 10 +++++----- ...pt.sh => odroid_x2_u2_image_generator_script.sh} | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) rename boot/arm/{odroid-u2-x2 => odroid-x2-u2}/sd_fuse/bl1.HardKernel (100%) rename boot/arm/{odroid-u2-x2 => odroid-x2-u2}/sd_fuse/bl2.HardKernel (100%) rename boot/arm/{odroid-u2-x2 => odroid-x2-u2}/sd_fuse/sd_fusing.sh (100%) rename boot/arm/{odroid-u2-x2 => odroid-x2-u2}/sd_fuse/tzsw.HardKernel (100%) rename boot/arm/{odroid-u2-x2 => odroid-x2-u2}/u-boot.bin (100%) rename molecules/{sabayon-arm-odroid-u2-x2-8G.spec => sabayon-arm-odroid-x2-u2-8G.spec} (89%) rename scripts/{odroid_u2_x2_image_generator_script.sh => odroid_x2_u2_image_generator_script.sh} (86%) diff --git a/boot/arm/odroid-u2-x2/sd_fuse/bl1.HardKernel b/boot/arm/odroid-x2-u2/sd_fuse/bl1.HardKernel similarity index 100% rename from boot/arm/odroid-u2-x2/sd_fuse/bl1.HardKernel rename to boot/arm/odroid-x2-u2/sd_fuse/bl1.HardKernel diff --git a/boot/arm/odroid-u2-x2/sd_fuse/bl2.HardKernel b/boot/arm/odroid-x2-u2/sd_fuse/bl2.HardKernel similarity index 100% rename from boot/arm/odroid-u2-x2/sd_fuse/bl2.HardKernel rename to boot/arm/odroid-x2-u2/sd_fuse/bl2.HardKernel diff --git a/boot/arm/odroid-u2-x2/sd_fuse/sd_fusing.sh b/boot/arm/odroid-x2-u2/sd_fuse/sd_fusing.sh similarity index 100% rename from boot/arm/odroid-u2-x2/sd_fuse/sd_fusing.sh rename to boot/arm/odroid-x2-u2/sd_fuse/sd_fusing.sh diff --git a/boot/arm/odroid-u2-x2/sd_fuse/tzsw.HardKernel b/boot/arm/odroid-x2-u2/sd_fuse/tzsw.HardKernel similarity index 100% rename from boot/arm/odroid-u2-x2/sd_fuse/tzsw.HardKernel rename to boot/arm/odroid-x2-u2/sd_fuse/tzsw.HardKernel diff --git a/boot/arm/odroid-u2-x2/u-boot.bin b/boot/arm/odroid-x2-u2/u-boot.bin similarity index 100% rename from boot/arm/odroid-u2-x2/u-boot.bin rename to boot/arm/odroid-x2-u2/u-boot.bin diff --git a/build.sh b/build.sh index b7fb3db..cf574da 100755 --- a/build.sh +++ b/build.sh @@ -52,7 +52,7 @@ update_docker_companion update_chroot sabayon/rpi-armhfp rpi #update_chroot sabayon/rpi-armhfp bananapi update_chroot sabayon/rpi-mc-armhfp rpi-mc -update_chroot sabayon/odroid-u2-x2-armhfp odroid-u2-x2 +update_chroot sabayon/odroid-x2-u2-armhfp odroid-x2-u2 update_chroot sabayon/odroid-c2-armhfp odroid-c2 update_chroot sabayon/udooneo-armhfp udooneo @@ -62,7 +62,7 @@ echo "Release ${SABAYON_RELEASE}" SABAYON_MOLECULE_HOME=$(pwd) molecule molecules/sabayon-arm-rpi-8G.spec SABAYON_MOLECULE_HOME=$(pwd) molecule molecules/sabayon-arm-rpi-mc-8G.spec -SABAYON_MOLECULE_HOME=$(pwd) molecule molecules/sabayon-arm-odroid-u2-x2-8G.spec +SABAYON_MOLECULE_HOME=$(pwd) molecule molecules/sabayon-arm-odroid-x2-u2-8G.spec SABAYON_MOLECULE_HOME=$(pwd) molecule molecules/sabayon-arm-odroid-c2-8G.spec SABAYON_MOLECULE_HOME=$(pwd) molecule molecules/sabayon-arm-udooneo-8G.spec #SABAYON_MOLECULE_HOME=$(pwd) molecule molecules/sabayon-arm-bananapi-8G.spec diff --git a/molecules/sabayon-arm-odroid-u2-x2-8G.spec b/molecules/sabayon-arm-odroid-x2-u2-8G.spec similarity index 89% rename from molecules/sabayon-arm-odroid-u2-x2-8G.spec rename to molecules/sabayon-arm-odroid-x2-u2-8G.spec index 589de21..f833e27 100644 --- a/molecules/sabayon-arm-odroid-u2-x2-8G.spec +++ b/molecules/sabayon-arm-odroid-x2-u2-8G.spec @@ -1,6 +1,6 @@ %env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/arm-base.common -%env source_chroot: ${SABAYON_MOLECULE_HOME:-/sabayon}/sources/odroid-u2-x2 +%env source_chroot: ${SABAYON_MOLECULE_HOME:-/sabayon}/sources/odroid-x2-u2 packages_to_add: app-misc/sabayon-skel, @@ -13,14 +13,14 @@ packages_to_add: packages_to_remove: # Release desc (the actual release description) -release_desc: armv7l Odroid U2/X2 +release_desc: armv7l Odroid X2/U2 # Release Version (used to generate release_file) %env release_version: ${SABAYON_RELEASE:-11} # Specify image file name (image file name will be automatically # produced otherwise) -%env image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_armv7l_Odroid_U2_X2_8GB.img +%env image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_armv7l_Odroid_X2_U2_8GB.img # Specify the image file size in Megabytes. This is mandatory. # To avoid runtime failure, make sure the image is large enough to fit your @@ -28,10 +28,10 @@ release_desc: armv7l Odroid U2/X2 image_mb: 7200 # Path to boot partition data (MLO, u-boot.img etc) -%env source_boot_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/boot/arm/odroid-u2-x2 +%env source_boot_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/boot/arm/odroid-x2-u2 # External script that will generate the image file. # The same can be copied onto a MMC by using dd -%env image_generator_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/odroid_u2_x2_image_generator_script.sh +%env image_generator_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/odroid_x2_u2_image_generator_script.sh diff --git a/scripts/odroid_u2_x2_image_generator_script.sh b/scripts/odroid_x2_u2_image_generator_script.sh similarity index 86% rename from scripts/odroid_u2_x2_image_generator_script.sh rename to scripts/odroid_x2_u2_image_generator_script.sh index 3585172..1f8754a 100755 --- a/scripts/odroid_u2_x2_image_generator_script.sh +++ b/scripts/odroid_x2_u2_image_generator_script.sh @@ -6,6 +6,6 @@ export SABAYON_MOLECULE_HOME # rootfs and bootfs tarball is generated by beaglebone image export FIRST_PARTITION_START_CYL=1 # ~8Mb -export SD_FUSE="${SABAYON_MOLECULE_HOME}/boot/arm/odroid-u2-x2/sd_fuse/sd_fusing.sh" +export SD_FUSE="${SABAYON_MOLECULE_HOME}/boot/arm/odroid-x2-u2/sd_fuse/sd_fusing.sh" export BOOT_PART_TYPE_INSIDE_ROOT="1" exec "${SABAYON_MOLECULE_HOME}"/scripts/mkloopcard.sh "${SABAYON_MOLECULE_HOME}"/scripts/mkloopcard_generic_hook.sh "${@}"