From: Arne Fitzenreiter <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. f622fd8ed09d60b627da3589d91b9fc8d6a77393
Date: Sat, 12 Jan 2019 19:02:09 +0000 [thread overview]
Message-ID: <20190112190209.EF9EC84FDD4@people01.i.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 2365 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via f622fd8ed09d60b627da3589d91b9fc8d6a77393 (commit)
from 00f9dcd91d5edbd7ae3acd0d731c0d415079bae5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f622fd8ed09d60b627da3589d91b9fc8d6a77393
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Jan 12 20:01:00 2019 +0100
linux-initrd: fix build of uInit on aarch64
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/aarch64/linux-initrd | 2 +-
lfs/linux-initrd | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
Difference in files:
diff --git a/config/rootfiles/common/aarch64/linux-initrd b/config/rootfiles/common/aarch64/linux-initrd
index a5a0da72e..8abbf654a 100644
--- a/config/rootfiles/common/aarch64/linux-initrd
+++ b/config/rootfiles/common/aarch64/linux-initrd
@@ -1,2 +1,2 @@
-#boot/uInit-KVER-ipfire
+boot/uInit-KVER-ipfire
boot/initramfs-KVER-ipfire.img
diff --git a/lfs/linux-initrd b/lfs/linux-initrd
index 3f0a80739..f5bd4527b 100644
--- a/lfs/linux-initrd
+++ b/lfs/linux-initrd
@@ -71,13 +71,13 @@ ifeq "$(KCFG)" "-kirkwood"
endif
ifeq "$(KCFG)" "-multi"
-ifeq "$(BUILD_ARCH)" "aarch64"
- cd /boot && mkimage -A arm64 -T ramdisk -C lzma -d initramfs-$(KVER)-$(VERSUFIX).img uInit-$(KVER)-$(VERSUFIX)
- # dont remove initramfs because grub need this to boot.
-else
cd /boot && mkimage -A arm -T ramdisk -C lzma -d initramfs-$(KVER)-$(VERSUFIX).img uInit-$(KVER)-$(VERSUFIX)
cd /boot && rm initramfs-$(KVER)-$(VERSUFIX).img
endif
+
+ifeq "$(BUILD_ARCH)" "aarch64"
+ cd /boot && mkimage -A arm64 -T ramdisk -C lzma -d initramfs-$(KVER)-$(VERSUFIX).img uInit-$(KVER)-$(VERSUFIX)
+ # dont remove initramfs because grub need this to boot.
endif
endif
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2019-01-12 19:02 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20190112190209.EF9EC84FDD4@people01.i.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.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