| 1 |
On Fri, 1 May 2020 18:40:31 -0700 |
| 2 |
Matt Turner <mattst88@g.o> wrote: |
| 3 |
|
| 4 |
> Signed-off-by: Matt Turner <mattst88@g.o> |
| 5 |
> --- |
| 6 |
|
| 7 |
Again, no reasoning |
| 8 |
|
| 9 |
|
| 10 |
|
| 11 |
|
| 12 |
> targets/support/filesystem-functions.sh | 19 ------------------- |
| 13 |
> targets/support/target_image_setup.sh | 20 ++++++-------------- |
| 14 |
> 2 files changed, 6 insertions(+), 33 deletions(-) |
| 15 |
> delete mode 100755 targets/support/filesystem-functions.sh |
| 16 |
> |
| 17 |
> diff --git a/targets/support/filesystem-functions.sh |
| 18 |
> b/targets/support/filesystem-functions.sh deleted file mode 100755 |
| 19 |
> index a95ae0b9..00000000 |
| 20 |
> --- a/targets/support/filesystem-functions.sh |
| 21 |
> +++ /dev/null |
| 22 |
> @@ -1,19 +0,0 @@ |
| 23 |
> -#!/bin/bash |
| 24 |
> - |
| 25 |
> -# Dont forget to update functions.sh check_looptype |
| 26 |
> -# $1 is the target directory for the filesystem |
| 27 |
> - |
| 28 |
> -create_squashfs() { |
| 29 |
> - echo "Creating squashfs..." |
| 30 |
> - export loopname="image.squashfs" |
| 31 |
> - gensquashfs -D "${clst_destpath}" ${clst_fsops} |
| 32 |
> "$1/${loopname}" \ |
| 33 |
> - || die "gensquashfs failed, did you emerge |
| 34 |
> squashfs-tools-ng?" -} |
| 35 |
> - |
| 36 |
> -create_jffs2(){ |
| 37 |
> - echo "Creating jffs2..." |
| 38 |
> - export loopname="image.jffs" |
| 39 |
> - # fs_check /usr/sbin/mkfs.jffs2 jffs2 sys-fs/mtd |
| 40 |
> - mkfs.jffs2 --root=${clst_destpath} --output=$1/${loopname} |
| 41 |
> ${clst_fsops} \ |
| 42 |
> - || die "Could not create a jffs2 filesystem" |
| 43 |
> -} |
| 44 |
> diff --git a/targets/support/target_image_setup.sh |
| 45 |
> b/targets/support/target_image_setup.sh index 423dc4c4..03cb4741 |
| 46 |
> 100755 --- a/targets/support/target_image_setup.sh |
| 47 |
> +++ b/targets/support/target_image_setup.sh |
| 48 |
> @@ -1,25 +1,17 @@ |
| 49 |
> #!/bin/bash |
| 50 |
> |
| 51 |
> source ${clst_shdir}/support/functions.sh |
| 52 |
> -source ${clst_shdir}/support/filesystem-functions.sh |
| 53 |
> |
| 54 |
> -# Make the directory if it doesnt exist |
| 55 |
> -mkdir -p $1 |
| 56 |
> +mkdir -p "${1}" |
| 57 |
> |
| 58 |
> -loopret=1 |
| 59 |
> +echo "Creating ${clst_fstype} filesystem" |
| 60 |
> case ${clst_fstype} in |
| 61 |
> squashfs) |
| 62 |
> - create_squashfs $1 |
| 63 |
> - loopret=$? |
| 64 |
> + gensquashfs -D "${clst_destpath}" "${clst_fsops}" |
| 65 |
> "${1}/image.squashfs" \ |
| 66 |
> + || die "Failed to create squashfs filesystem" |
| 67 |
> ;; |
| 68 |
> jffs2) |
| 69 |
> - create_jffs2 $1 |
| 70 |
> - loopret=$? |
| 71 |
> + mkfs.jffs2 --root="${clst_destpath}" |
| 72 |
> --output="${1}/image.jffs" "${clst_fsops}" \ |
| 73 |
> + || die "Failed to create jffs2 filesystem" |
| 74 |
> ;; |
| 75 |
> esac |
| 76 |
> - |
| 77 |
> -if [ ${loopret} = "1" ] |
| 78 |
> -then |
| 79 |
> - die "Filesystem not setup" |
| 80 |
> -fi |
| 81 |
> -exit $loopret |
Archives