Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
aports
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
alpine
aports
Commits
46f4244a
Commit
46f4244a
authored
5 years ago
by
Natanael Copa
Browse files
Options
Downloads
Patches
Plain Diff
scripts: replace -vanilla kernel with -lts
also add doas to extended image
parent
23623612
Loading
Loading
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
scripts/bootstrap.sh
+2
-2
2 additions, 2 deletions
scripts/bootstrap.sh
scripts/mkimg.arm.sh
+1
-1
1 addition, 1 deletion
scripts/mkimg.arm.sh
scripts/mkimg.netboot.sh
+1
-1
1 addition, 1 deletion
scripts/mkimg.netboot.sh
scripts/mkimg.standard.sh
+2
-2
2 additions, 2 deletions
scripts/mkimg.standard.sh
with
6 additions
and
6 deletions
scripts/bootstrap.sh
+
2
−
2
View file @
46f4244a
...
...
@@ -6,7 +6,7 @@ TARGET_ARCH="$1"
SUDO_APK
=
abuild-apk
# optional cross build packages
KERNEL_PKG
=
"linux-firmware linux-
vanilla
"
KERNEL_PKG
=
"linux-firmware linux-
lts
"
# get abuild configurables
[
-e
/usr/share/abuild/functions.sh
]
||
(
echo
"abuild not found"
;
exit
1
)
...
...
@@ -46,7 +46,7 @@ Steps for introducing new architecture include:
- adding the arch type detection to apk-tools
- adjusting build rules for packages that are arch aware:
gcc, openssl, linux-headers
- create new kernel config for linux-
vanilla
- create new kernel config for linux-
lts
After these steps the initial cross-build can be completed
by running this with the target arch as parameter, e.g.:
...
...
This diff is collapsed.
Click to expand it.
scripts/mkimg.arm.sh
+
1
−
1
View file @
46f4244a
...
...
@@ -118,7 +118,7 @@ profile_uboot() {
Supports armhf and aarch64."
image_ext
=
"tar.gz"
arch
=
"aarch64 armhf armv7"
kernel_flavors
=
"
vanilla
"
kernel_flavors
=
"
lts
"
kernel_addons
=
"xtables-addons"
initfs_features
=
"base bootchart squashfs ext4 kms mmc raid scsi usb"
apkovl
=
"genapkovl-dhcp.sh"
...
...
This diff is collapsed.
Click to expand it.
scripts/mkimg.netboot.sh
+
1
−
1
View file @
46f4244a
...
...
@@ -12,7 +12,7 @@ profile_netboot() {
"
arch
=
"aarch64 armhf armv7 ppc64le x86 x86_64 s390x"
kernel_cmdline
=
"nomodeset"
kernel_flavors
=
"
vanilla
"
kernel_flavors
=
"
lts
"
modloop_sign
=
yes
apks
=
""
initfs_features
=
"base network squashfs usb virtio"
...
...
This diff is collapsed.
Click to expand it.
scripts/mkimg.standard.sh
+
2
−
2
View file @
46f4244a
...
...
@@ -30,9 +30,9 @@ profile_extended() {
Suitable for routers and servers.
Runs from RAM."
arch
=
"x86 x86_64"
kernel_addons
=
"
dahdi-linux
xtables-addons zfs
spl
"
kernel_addons
=
"xtables-addons zfs"
apks
=
"
$apks
dahdi-linux dahdi-tools
ethtool hwdata lftp links
ethtool hwdata lftp links
doas
logrotate lua5.3 lsof lm_sensors lxc lxc-templates nano
pax-utils paxmark pciutils screen strace sudo tmux
usbutils v86d vim xtables-addons curl
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment