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
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
Jakub Panek
aports
Commits
be7b8057
Commit
be7b8057
authored
15 years ago
by
Natanael Copa
Browse files
Options
Downloads
Patches
Plain Diff
alpine.mk: new location for kernel.release file
move isolinux to /boot directory to keep cdrom more tidy.
parent
9fc50892
Loading
Loading
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
alpine.mk
+16
-11
16 additions, 11 deletions
alpine.mk
with
16 additions
and
11 deletions
alpine.mk
+
16
−
11
View file @
be7b8057
...
...
@@ -105,7 +105,7 @@ $(MODLOOP_KERNELSTAMP):
apk fetch
$(
APK_OPTS
)
--stdout
$$
i
\
|
tar
-C
$(
MODLOOP_DIR
)
-xz
;
\
done
@
cp
$(
MODLOOP_DIR
)
/usr/share/
$(
KERNEL_
PKGNAME
)
/kernel.release
$@
@
cp
$(
MODLOOP_DIR
)
/usr/share/
kernel/
$(
KERNEL_
FLAVOR
)
/kernel.release
$@
MODLOOP_KERNEL_RELEASE
=
$(
shell
cat
$(
MODLOOP_KERNELSTAMP
))
...
...
@@ -126,7 +126,10 @@ clean-modloop:
# Initramfs rules
#
INITFS
:=
$(
ISO_DIR
)
/boot/
$(
KERNEL_NAME
)
.gz
# isolinux cannot handle - in filenames
#INITFS_NAME := initramfs-$(MODLOOP_KERNEL_RELEASE)
INITFS_NAME
:=
$(
KERNEL_FLAVOR
)
.gz
INITFS
:=
$(
ISO_DIR
)
/boot/
$(
INITFS_NAME
)
INITFS_DIR
:=
$(
DESTDIR
)
/initfs
INITFS_TMP
:=
$(
DESTDIR
)
/tmp.initfs
...
...
@@ -164,18 +167,20 @@ VSTEMPLATE_DIR := $(DESTDIR)/vs-template
vstemplate
:
$(VSTEMPLATE)
@
echo
"==> vstemplate: built
$(
VSTEMPLATE
)
"
#must be run as root or in fakeroot
$(VSTEMPLATE)
:
@
$(
SUDO
)
rm
-rf
"
$(
VSTEMPLATE_DIR
)
"
@
$(
SUDO
)
mkdir
-p
"
$(
VSTEMPLATE_DIR
)
"
@
$(
SUDO
)
apk add
$(
APK_OPTS
)
--initdb
--root
$(
VSTEMPLATE_DIR
)
\
@
rm
-rf
"
$(
VSTEMPLATE_DIR
)
"
@
mkdir
-p
"
$(
VSTEMPLATE_DIR
)
"
@
apk add
$(
APK_OPTS
)
--initdb
--root
$(
VSTEMPLATE_DIR
)
\
alpine-base
@
cd
$(
VSTEMPLATE_DIR
)
&&
$(
SUDO
)
tar
-jcf
$@
*
@
cd
$(
VSTEMPLATE_DIR
)
&&
tar
-jcf
$@
*
#
# ISO rules
#
ISOLINUX
:=
$(
ISO_DIR
)
/isolinux
ISOLINUX_DIR
:=
boot/isolinux
ISOLINUX
:=
$(
ISO_DIR
)
/
$(
ISOLINUX_DIR
)
ISOLINUX_BIN
:=
$(
ISOLINUX
)
/isolinux.bin
ISOLINUX_CFG
:=
$(
ISOLINUX
)
/isolinux.cfg
SYSLINUX_CFG
:=
$(
ISO_DIR
)
/syslinux.cfg
...
...
@@ -195,7 +200,7 @@ $(ISOLINUX_CFG):
@
echo
"default
$(
KERNEL_NAME
)
"
>>
$(
ISOLINUX_CFG
)
@
echo
"label
$(
KERNEL_NAME
)
"
>>
$(
ISOLINUX_CFG
)
@
echo
" kernel /boot/
$(
KERNEL_NAME
)
"
>>
$(
ISOLINUX_CFG
)
@
echo
" append initrd=/boot/
$(
KERNEL
_NAME
)
.gz
alpine_dev=cdrom:iso9660 modules=loop,cramfs,sd-mod,usb-storage,floppy quiet"
>>
$(
ISOLINUX_CFG
)
@
echo
" append initrd=/boot/
$(
INITFS
_NAME
)
alpine_dev=cdrom:iso9660 modules=loop,cramfs,sd-mod,usb-storage,floppy quiet"
>>
$(
ISOLINUX_CFG
)
$(SYSLINUX_CFG)
:
$(MODLOOP_DIRSTAMP)
@
echo
"==> iso: configure syslinux"
...
...
@@ -204,7 +209,7 @@ $(SYSLINUX_CFG): $(MODLOOP_DIRSTAMP)
@
echo
"default
$(
KERNEL_NAME
)
"
>>
$@
@
echo
"label
$(
KERNEL_NAME
)
"
>>
$@
@
echo
" kernel /boot/
$(
KERNEL_NAME
)
"
>>
$@
@
echo
" append initrd=/boot/
$(
KERNEL
_NAME
)
.gz
alpine_dev=usbdisk:vfat modules=loop,cramfs,sd-mod,usb-storage quiet"
>>
$@
@
echo
" append initrd=/boot/
$(
INITFS
_NAME
)
alpine_dev=usbdisk:vfat modules=loop,cramfs,sd-mod,usb-storage quiet"
>>
$@
clean-syslinux
:
@
rm
-f
$(
SYSLINUX_CFG
)
$(
ISOLINUX_CFG
)
$(
ISOLINUX_BIN
)
...
...
@@ -240,8 +245,8 @@ $(ISOFS_DIRSTAMP): $(MODLOOP) $(INITFS) $(ISOLINUX_CFG) $(ISOLINUX_BIN) $(ISO_KE
$(ISO)
:
$(ISOFS_DIRSTAMP)
@
echo
"==> iso: building
$(
notdir
$(
ISO
))
"
@
genisoimage
-o
$(
ISO
)
-l
-J
-R
\
-b
isolinux
/isolinux.bin
\
-c
isolinux
/boot.cat
\
-b
$(
ISOLINUX_DIR
)
/isolinux.bin
\
-c
$(
ISOLINUX_DIR
)
/boot.cat
\
-no-emul-boot
\
-boot-load-size
4
\
-boot-info-table
\
...
...
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