From cd3e72ee6875e3744fa8b694937ea352889cefcb Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Mon, 20 Oct 2008 23:41:54 -0500 Subject: [PATCH] Rework installer config to support new changes Lots of changes, mainly for argument processing and things of that nature in mkarchiso. Split out some common functionality in the Maekfile as well. Signed-off-by: Aaron Griffin --- configs/install-iso/Makefile | 62 +++++++++++-------- configs/install-iso/boot-files/grub/menu.lst | 4 -- configs/install-iso/boot-files/splash.xpm.gz | Bin 4019 -> 8371 bytes configs/install-iso/mounts | 3 +- configs/install-iso/packages.list-i686 | 2 +- configs/install-iso/packages.list-x86_64 | 2 +- 6 files changed, 39 insertions(+), 34 deletions(-) diff --git a/configs/install-iso/Makefile b/configs/install-iso/Makefile index 0a99075..a04b43f 100644 --- a/configs/install-iso/Makefile +++ b/configs/install-iso/Makefile @@ -1,41 +1,49 @@ ver=2008.10 kver=2.6.27-ARCH -carch=i686 -FTPname=$(PWD)/archlinux-$(ver)-ftp-$(carch) -COREname=$(PWD)/archlinux-$(ver)-core-$(carch) + +#Define outside of 'make' for other arches +ARCH=i686 + +PWD=`pwd` +FTPname=$(PWD)/archlinux-$(ver)-ftp-$(ARCH) +COREname=$(PWD)/archlinux-$(ver)-core-$(ARCH) all: core-iso core-usb ftp-iso ftp-usb +all-iso: core-iso ftp-iso +all-usb: core-usb ftp-usb -core-usb: .work-core - mkinitcpio -c initcpio-ide -b .work-core/install -k $(kver) -g .work-core/img/boot/archiso-ide.img - mkarchiso -v -t disk -i initcpio-pata img .work-core $(COREname).img +core-usb: core-pkgs root-image boot-files + mkarchiso -v -p grub-gfx -t disk image image-dir/ $(COREname).img -core-iso: .work-core - mkinitcpio -c initcpio-ide -b .work-core/install -k $(kver) -g .work-core/img/boot/archiso-ide.img - mkarchiso -v -t iso -i initcpio-pata img .work-core $(COREname).iso +core-iso: core-pkgs root-image boot-files + mkarchiso -v -p grub-gfx image image-dir/ $(FTPname).iso -ftp-usb: .work-ftp - mkinitcpio -c initcpio-ide -b .work-ftp/install -k $(kver) -g .work-ftp/img/boot/archiso-ide.img - mkarchiso -v -t disk -i initcpio-pata img .work-ftp $(FTPname).img +ftp-usb: root-image boot-files + mkarchiso -v -p grub-gfx -t disk image image-dir/ $(FTPname).img -ftp-iso: .work-ftp - mkinitcpio -c initcpio-ide -b .work-ftp/install -k $(kver) -g .work-ftp/img/boot/archiso-ide.img - mkarchiso -v -t iso -i initcpio-pata img .work-ftp $(FTPname).iso +ftp-iso: root-image boot-files + mkarchiso -v -p grub-gfx image image-dir/ $(FTPname).iso -.work-ftp: +.PHONY: boot-files +boot-files: + mkdir -p image-dir/boot/ + cp -r boot-files/* image-dir/boot/ + mkinitcpio -c initcpio-ide -b work/ -k $(kver) -g image-dir/boot/archiso-ide.img + mkinitcpio -c initcpio-pata -b work/ -k $(kver) -g image-dir/boot/archiso-pata.img + +root-image: chmod 0440 overlay/etc/sudoers - mkarchiso -v -P packages.list-$(carch) install .work-ftp - mkarchiso -v squash .work-ftp - -.work-core: addons/core-pkgs - chmod 0440 overlay/etc/sudoers - mkarchiso -v -a addons -P packages.list-$(carch) install .work-core - mkarchiso -v squash .work-core + mkarchiso -v -p "`cat packages.list-$(ARCH)`" install work + cp -r overlay/* work + mkdir image-dir/ + mkarchiso -v squash work image-dir/root-image.sqfs # hacky way to always pull -.PHONY: addons/core-pkgs -addons/core-pkgs: - wget --mirror -P addons/core-pkgs -nH --cut-dirs=3 ftp://ftp.archlinux.org/core/os/$(carch) +.PHONY: core-pkgs +core-pkgs: + wget --mirror -P core-pkgs -nH --cut-dirs=3 ftp://ftp.archlinux.org/core/os/$(ARCH) + mkdir image/ + mkarchiso -v squash core-pkgs image-dir/core-pkgs.sqfs clean: - rm -fr .work-ftp .work-core + rm -rf work image diff --git a/configs/install-iso/boot-files/grub/menu.lst b/configs/install-iso/boot-files/grub/menu.lst index 7d47842..6755d09 100644 --- a/configs/install-iso/boot-files/grub/menu.lst +++ b/configs/install-iso/boot-files/grub/menu.lst @@ -7,10 +7,6 @@ title Boot ArchLinux LiveCD kernel /boot/vmlinuz26 lang=en locale=en_US.UTF-8 ramdisk_size=75% initrd /boot/archiso.img -title Boot ArchLinux LiveCD [legacy IDE] -kernel /boot/vmlinuz26 lang=en locale=en_US.UTF-8 ramdisk_size=75% ide-legacy -initrd /boot/archiso-ide.img - title Tools... configfile /boot/grub/tools.lst diff --git a/configs/install-iso/boot-files/splash.xpm.gz b/configs/install-iso/boot-files/splash.xpm.gz index e44af438424bc9a5fc764712b821b4fde3bbf6d4..9f128bf9132a70f660f141227f5fc1c59c1f6f41 100644 GIT binary patch literal 8371 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 DQj@TU literal 4019 zcmeH~>01(r7RFn=T8&C$g^nB3#9))#pa?DnQ{5IVw5f5+ZCnv?ffThAoURMwXj)LB zs9ASXD^Uy+H8HLtC~BJfRvI!!_2zO@s7w)&)x8HN#=bR7cyyra60cGvkb0KH* z+>YItYs4U!RU$rW$J|?=nDO?V8RD7uo(AH*288FMl{EXW&u7OjyahH{TskO#A06{w z{$&n$^wKhqZhQK&u?w>G-u9isVf~&AAo{|H=#n*{1Mz+e!BeSPl9#4RP}>Xr0my)4 z)e->ZpPz-=UT2|vRjNt#`b1z7h!G~2S{X}9Mm{4SpJ^y+rMy){f! z);{y}qs_)A{@z_3`iGl@`x@-iGDy~jqiXoJFj3yoiiLYDaYGS+5prR~UUS^;IDP3P zE%MiYKNV(PQu%i8L9-8!5wulY-JaLr@xv8uP%ky}Z*Kmnf4Bh9Q_t*jJAV6woANcd zu$f4KjubB~Tbqg}OPXzOF7mRX_=QRJWwF#|H${9XOi~I*I z=VTJc5)izwezV$|obgvIo!{F`_=X!ADrI+(n)Av@ip87unkA~*Ua-;O0Nqnb5hpwi z#s`RR?KoXR`EMz+}Zyb?9Wmh-OUg+kvj^m=xz;_TISXRGM0C z<;tXUv9LgmLqvn>hFfiMo9J5p$@^oBNCeEe7_Z|m zq5aFYp@EXH*@gLDFWar@M)peSPu60w z;n_cuwdbQYSNqe%LyypXw=h0Tp8P54!{7;+XtRN6XdG6Dot_F$w}EGt@Ri2`pIgRs z`V^Uo+DHnvGc~Jj{QEbqcA08g$*xzjBl%_zoIP?IiH5#K7KFCoT4P4YNNxu9+Vvy< zi8f3Pgcb_lv7O(efU5#NqD|fqJ?65G3pQQfg{2PCCXpKbPr~el7<8a8*s}kny~a82 zzWD34AE(ADv8KLo=WB?`NNv~2nb@!~myLgTy1xcjNI%@32>Rw?+hvoQ2Tc9o*DO70 z^K_s@Q0pT(o;Uzr5_4<=>qq<1dSrMpLjEs^w^LipB9+A#=^?VK>%()}-XZ6SbbTj_ zs<)02dQLEBy@qGbeTdBM0|s?e;-IKA$n6x3S?pBad_AxgYHu1OqFA{y9-Ww_19-u` zVDWs@b=t^yVXIYP$Qze{-uEB$-)f@S*E)QJ6U%lw_wDmCY~Jd$Y4t-gjhwOz@s?eF zXllBjG7|zdV}J`8t+_mMJ{-`fkq7a1=)`H~j3vCN0e4?R1A!D82usVJj?6e<>Me1T zS}{TxS|nPCcy8)b@_o=KwnvGqEY0 zO1RenEQoEGyoB0AN84mKlNQMf97qAEKAKY5df`xu010qBb)Lp#Y@85~tqmuXp)#M= zXf7UQX^Fn$}n=>1X33za)vTK0;W_LEiUVny~<&P7^XgRj!%GPsyly>M|>FFI)6_N7N5{&CnFeFTLM?lwLfh>6Bh9pRa%K3kLD zU8@e_B(p|U%MnaoE3dPdH*{mTTb_1ozFr;kr!}CX*IpEwqCo{sGaVfqnIUeGB(}y7 zRi^vZlN)({fh{gkUrlfv#%s%pglLZhxYc{e?1NjGC62V762>z^uOKUwKb={H-IQ^v zm&`lHAiTBGKCn5Y$?LE~Pg2}cpSUf<3D!0aODNavOD75i>r%y!^oC`#sTdBH?{jk`vGqx^=3y=7myD2F z3oDQFsHLBe1HBTWxM%!SaUcMi?E%!zD=uL<06u{_qh#N^MIF*?^*LzzTBW> zvjm@L^OsQcTTLi=G21h*FvI}4OrEGcNn_p_wG{X@=I=Nl1dRMvf$TKPF99(^ZjJB{ zCdzf;P8TzbwzVd()I&DO_?SWD?1K{Xx%_Ti;%b04nvKkm^vvWL&gm3PmwyY@- zZ;-e@NuF$!*i|($U-|`1^l_p5huI^#4qG$ppw)*o^HhkpiBN66KX=0$^FosQcwz@k zG}cb~0=0;#;gFVlK0a_BI$NMd86923T&H5v|EG^1R~fT3l@hk|=3aWe#*Y62s#QW& diff --git a/configs/install-iso/mounts b/configs/install-iso/mounts index 0946f5d..16414ca 100644 --- a/configs/install-iso/mounts +++ b/configs/install-iso/mounts @@ -4,4 +4,5 @@ # syntax: -core-pkgs /src/core/pkg bind +root-image / bind +core-pkgs /src/core/pkg bind diff --git a/configs/install-iso/packages.list-i686 b/configs/install-iso/packages.list-i686 index f7ef459..287de78 100644 --- a/configs/install-iso/packages.list-i686 +++ b/configs/install-iso/packages.list-i686 @@ -10,9 +10,9 @@ intel-536ep intel-537 ipw2100-fw ipw2200-fw -ipw3945 iwlwifi-3945-ucode iwlwifi-4965-ucode +iwlwifi-5000-ucode lftp lilo lshwd diff --git a/configs/install-iso/packages.list-x86_64 b/configs/install-iso/packages.list-x86_64 index d016c38..a82830e 100644 --- a/configs/install-iso/packages.list-x86_64 +++ b/configs/install-iso/packages.list-x86_64 @@ -8,9 +8,9 @@ gnu-netcat grub-gfx ipw2100-fw ipw2200-fw -ipw3945 iwlwifi-3945-ucode iwlwifi-4965-ucode +iwlwifi-5000-ucode lftp lilo lshwd