From: Brian Dolbec <dolsen@gentoo.org>
To: gentoo-catalyst@lists.gentoo.org
Subject: Re: [gentoo-catalyst] [PATCH 6/8] targets: Inline functions with one caller
Date: Sat, 2 May 2020 16:12:48 -0700 [thread overview]
Message-ID: <20200502161248.162a34ad@storm> (raw)
In-Reply-To: <20200502014036.1039317-6-mattst88@gentoo.org>
On Fri, 1 May 2020 18:40:34 -0700
Matt Turner <mattst88@gentoo.org> wrote:
> Signed-off-by: Matt Turner <mattst88@gentoo.org>
> ---
Please list the functions inlined. That way anyone does not have to
read the actual patch to know. I know this is short and simple, but
if there were 5 or 6 inlined in as many different files...
otherwise looks fine
> targets/support/bootloader-setup.sh | 21 +++++++++++++++++++--
> targets/support/functions.sh | 22 ----------------------
> 2 files changed, 19 insertions(+), 24 deletions(-)
>
> diff --git a/targets/support/bootloader-setup.sh
> b/targets/support/bootloader-setup.sh index d507fe5e..d3a6b2dc 100755
> --- a/targets/support/bootloader-setup.sh
> +++ b/targets/support/bootloader-setup.sh
> @@ -19,8 +19,25 @@ else
> fi
>
> extract_kernels $1/boot
> -check_bootargs
> -check_filesystem_type
> +
> +# Add any additional options
> +if [ -n "${clst_livecd_bootargs}" ]
> +then
> + for x in ${clst_livecd_bootargs}
> + do
> + cmdline_opts="${cmdline_opts} ${x}"
> + done
> +fi
> +
> +case ${clst_fstype} in
> + squashfs)
> + cmdline_opts="${cmdline_opts} looptype=squashfs
> loop=/image.squashfs"
> + ;;
> + jffs2)
> + cmdline_opts="${cmdline_opts} looptype=jffs2
> loop=/image.jffs2"
> + ;;
> +esac
> +
>
> default_append_line="root=/dev/ram0 init=/linuxrc ${cmdline_opts}
> ${custom_kopts} cdroot" [ -n "${clst_splash_theme}" ] &&
> default_append_line="${default_append_line}
> splash=silent,theme:${clst_livecd_splash_theme} CONSOLE=/dev/tty1
> quiet" diff --git a/targets/support/functions.sh
> b/targets/support/functions.sh index 601f5dc9..ac6710ad 100755 ---
> a/targets/support/functions.sh +++ b/targets/support/functions.sh @@
> -216,25 +216,3 @@ extract_kernel() { mv ${1}/initramfs-* ${1}/${2}.igz
> fi
> }
> -
> -check_bootargs(){
> - # Add any additional options
> - if [ -n "${clst_livecd_bootargs}" ]
> - then
> - for x in ${clst_livecd_bootargs}
> - do
> - cmdline_opts="${cmdline_opts} ${x}"
> - done
> - fi
> -}
> -
> -check_filesystem_type(){
> - case ${clst_fstype} in
> - squashfs)
> - cmdline_opts="${cmdline_opts}
> looptype=squashfs loop=/image.squashfs"
> - ;;
> - jffs2)
> - cmdline_opts="${cmdline_opts} looptype=jffs2
> loop=/image.jffs2"
> - ;;
> - esac
> -}
next prev parent reply other threads:[~2020-05-02 23:12 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-02 1:40 [gentoo-catalyst] [PATCH 1/8] targets: Use gensquashfs instead of mksquashfs Matt Turner
2020-05-02 1:40 ` [gentoo-catalyst] [PATCH 2/8] targets: Drop most fstypes Matt Turner
2020-05-02 23:00 ` Brian Dolbec
2020-05-02 23:17 ` Matt Turner
2020-05-02 1:40 ` [gentoo-catalyst] [PATCH 3/8] targets: Inline filesystem-functions.sh Matt Turner
2020-05-02 23:03 ` Brian Dolbec
2020-05-02 23:18 ` Matt Turner
2020-05-03 0:25 ` Brian Dolbec
2020-05-02 1:40 ` [gentoo-catalyst] [PATCH 4/8] targets: Remove unused source filesystem-functions.sh Matt Turner
2020-05-02 23:06 ` Brian Dolbec
2020-05-02 23:20 ` Matt Turner
2020-05-02 23:51 ` Brian Dolbec
2020-05-02 1:40 ` [gentoo-catalyst] [PATCH 5/8] targets: Remove run_crossdev() function Matt Turner
2020-05-02 23:06 ` Brian Dolbec
2020-05-02 23:22 ` Matt Turner
2020-05-02 23:45 ` Brian Dolbec
2020-05-02 1:40 ` [gentoo-catalyst] [PATCH 6/8] targets: Inline functions with one caller Matt Turner
2020-05-02 23:12 ` Brian Dolbec [this message]
2020-05-02 1:40 ` [gentoo-catalyst] [PATCH 7/8] targets: Remove unused extract_kernel() Matt Turner
2020-05-02 23:15 ` Brian Dolbec
2020-05-02 1:40 ` [gentoo-catalyst] [PATCH 8/8] catalyst: Replace target_portdir with repo_basedir+repo_name Matt Turner
2020-05-02 23:28 ` Brian Dolbec
2020-05-02 22:56 ` [gentoo-catalyst] [PATCH 1/8] targets: Use gensquashfs instead of mksquashfs Brian Dolbec
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200502161248.162a34ad@storm \
--to=dolsen@gentoo.org \
--cc=gentoo-catalyst@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox