Johannes/ISO
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the Makefile $ARCH adjust the isomounts file

Browse Source 
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
This commit is contained in:
Aaron Griffin 2008-12-24 10:27:42 -08:00
parent 571aa15309
commit 29d05d6bea
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configs/install-iso/Makefile
View File

@ -40,6 +40,7 @@ base-iso: root-image
mv $(WORKDIR)/root-image/boot $(WORKDIR)/iso/ mv $(WORKDIR)/root-image/boot $(WORKDIR)/iso/
cp -r boot-files/* $(WORKDIR)/iso/boot/ cp -r boot-files/* $(WORKDIR)/iso/boot/
cp isomounts $(WORKDIR) cp isomounts $(WORKDIR)
sed -i "s|@ARCH@|$(ARCH)|g" "$(WORKDIR)/isomounts"
mkinitcpio -c initcpio-ide -b $(WORKDIR)/root-image -k $(kver) -g $(WORKDIR)/iso/boot/archiso_ide.img mkinitcpio -c initcpio-ide -b $(WORKDIR)/root-image -k $(kver) -g $(WORKDIR)/iso/boot/archiso_ide.img
mkinitcpio -c initcpio-pata -b $(WORKDIR)/root-image -k $(kver) -g $(WORKDIR)/iso/boot/archiso_pata.img mkinitcpio -c initcpio-pata -b $(WORKDIR)/root-image -k $(kver) -g $(WORKDIR)/iso/boot/archiso_pata.img

6
configs/install-iso/isomounts
View File

@ -7,6 +7,6 @@
# syntax: <img> <arch> <mount point> <type> # syntax: <img> <arch> <mount point> <type>
# ORDER MATTERS! Files take top-down precedence. Be careful # ORDER MATTERS! Files take top-down precedence. Be careful
overlay.sqfs i686 / squashfs overlay.sqfs @ARCH@ / squashfs
core-pkgs.sqfs i686 /src/core/pkg squashfs core-pkgs.sqfs @ARCH@ /src/core/pkg squashfs
root-image.sqfs i686 / squashfs root-image.sqfs @ARCH@ / squashfs