From nobody Tue Aug 5 02:11:09 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bwxjp1S96z63ptJ; Tue, 05 Aug 2025 02:11:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bwxjp0WRFz3sHd; Tue, 05 Aug 2025 02:11:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754359870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IW90hEcww39q5xsrSdGTUurjcn9GRMPcp8IBI8gNZBk=; b=LnNRxMWSPE7dbU6fqFAh+vlgJE/QiWb23Qll2UT9HYcg/1kLTYLyGjPLQs8i1KvceHj018 3IgLJYocG6kK+BsuDeE4JeLQXCN1pgSDj6jWbAGHrIsJLAcZUecudlBXf7oyNon3K02Z4X XWanRUFBVsX/Akgo5X+NMqzojNxG0KeeDgBlvFp3oN2kzJbQ/kQCGxXBJ0HL+HvZ3ysPj7 FH8JX2zrwdITI+NDlDZOYVXha2di6djlGluFq6ZlxBvUYUIx0D/movbCOHCkWSjykCOzCK bCQ/fqRv+/AeYI9xAGHYUzOrbusObWWRhzgNpV7pCI5pN1mc0TY/FmODiMKbdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754359870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IW90hEcww39q5xsrSdGTUurjcn9GRMPcp8IBI8gNZBk=; b=qRUBFalFVBSaJIknNIIrLvJigmx8B1gBmpUUJGX0rKL+rJpkYkdqYqRe6gN29U+m1735ki 2M4n+Z1cRpFC1mAxKmJRYTUuA8M9ckGxrjtBEvO+cOpI8Oo/+1MUfTqKoE2lf4B5ulg8jm 2goWRBcRHwkyIEmel9lyY8+aBX9HazL612M+KjUgup7B8+XkfUA9d7fmPIWT14hYuLkTEc nN/wDQwTtqOQr6+9cfLQOPOujsD5puIII3WAonCiNey/qY1r2NEB7Wja9MZveD4w6v5y/p PWRF0fskDcMvCdqfltk4D42PrCM8E5tCEGaMaYYMmHYfU9fbYhPP+iV992NLNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754359870; a=rsa-sha256; cv=none; b=rXEeavmj4RGcwkXS9NxwwpR4ZupthlqPK6k//W66A9FMDcp3hQj/BeMIU8JCD9MDE37S10 oLvOKPXutuxPdlkYC5yH27zOLEeUr7g1i1RpTTzSsprxSAAguDSLasUMoFueNzOHUXsW/3 D1hxBYjyHOONoQR0JJz7d55dOCIlttpJTAykVUhVrrAGjy7q+5MXoya1XulPXqjjugfrmm 812UV71eqX8TKthpM5rfc3W85+Y2+vLbu9Goe5amf/tZB8NjPC2hlFKySiXC5BNSd/Fjew GLcnA17qagI4DzS1n6t6cwnPm1Ixy5QmzDc5hR11jyIsZa0gZfSox8AcwiCuvg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bwxjn6tGBzfv; Tue, 05 Aug 2025 02:11:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5752B97f026807; Tue, 5 Aug 2025 02:11:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5752B9NN026804; Tue, 5 Aug 2025 02:11:09 GMT (envelope-from git) Date: Tue, 5 Aug 2025 02:11:09 GMT Message-Id: <202508050211.5752B9NN026804@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ahmad Khalifa Subject: git: 057686379c8b - main - release/amd64: cleanup code duplication List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vexeduxr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 057686379c8bc24c3d2b78c3aa2e5d8b70221120 Auto-Submitted: auto-generated The branch main has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=057686379c8bc24c3d2b78c3aa2e5d8b70221120 commit 057686379c8bc24c3d2b78c3aa2e5d8b70221120 Author: Ahmad Khalifa AuthorDate: 2025-01-11 13:33:20 +0000 Commit: Ahmad Khalifa CommitDate: 2025-08-05 01:48:45 +0000 release/amd64: cleanup code duplication Approved by: imp (mentor) Pull Request: https://github.com/freebsd/freebsd-src/pull/1571 Closes: https://github.com/freebsd/freebsd-src/pull/1571 --- release/amd64/make-memstick.sh | 6 ++---- release/amd64/mkisoimages.sh | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/release/amd64/make-memstick.sh b/release/amd64/make-memstick.sh index cec4b27b5b96..770b128fd9f9 100755 --- a/release/amd64/make-memstick.sh +++ b/release/amd64/make-memstick.sh @@ -62,11 +62,9 @@ fi # Make an ESP in a file. espfilename=$(mktemp /tmp/efiboot.XXXXXX) if [ -f "${BASEBITSDIR}/boot/loader_ia32.efi" ]; then - make_esp_file ${espfilename} ${fat32min} ${BASEBITSDIR}/boot/loader.efi bootx64 \ - ${BASEBITSDIR}/boot/loader_ia32.efi bootia32 -else - make_esp_file ${espfilename} ${fat32min} ${BASEBITSDIR}/boot/loader.efi + extra_args="${BASEBITSDIR}/boot/loader_ia32.efi bootia32" fi +make_esp_file ${espfilename} ${fat32min} ${BASEBITSDIR}/boot/loader.efi bootx64 ${extra_args} ${MKIMG} -s mbr \ -b ${BASEBITSDIR}/boot/mbr \ diff --git a/release/amd64/mkisoimages.sh b/release/amd64/mkisoimages.sh index 8f7163e05261..01677ae787f9 100644 --- a/release/amd64/mkisoimages.sh +++ b/release/amd64/mkisoimages.sh @@ -54,11 +54,9 @@ if [ "$1" = "-b" ]; then # ESP file size in KB. espsize="2048" if [ -f "${BASEBITSDIR}/boot/loader_ia32.efi" ]; then - make_esp_file ${espfilename} ${espsize} ${BASEBITSDIR}/boot/loader.efi bootx64 \ - ${BASEBITSDIR}/boot/loader_ia32.efi bootia32 - else - make_esp_file ${espfilename} ${espsize} ${BASEBITSDIR}/boot/loader.efi + extra_args="${BASEBITSDIR}/boot/loader_ia32.efi bootia32" fi + make_esp_file ${espfilename} ${espsize} ${BASEBITSDIR}/boot/loader.efi bootx64 ${extra_args} bootable="$bootable -o bootimage=i386;${espfilename} -o no-emul-boot -o platformid=efi" shift