[arch-releng] [archiso] Several patches
Hi, some to discuss/revisit: In Makefile - when we set a Var (foobar=) - we use sometimes macros and sometimes we set it to the explicit value of a (extern) command. Maybe someone with good experience on Makefile syntax could revisit it. Gerhard
Added a script to overlay which call aif's interactiv procedure when /arch/setup is started. Also removed old arch-installer from packages.list Signed-off-by: Gerhard Brauer <gerbra@archlinux.de> --- configs/install-iso/overlay/arch/setup | 3 +++ configs/install-iso/packages.list | 1 - 2 files changed, 3 insertions(+), 1 deletions(-) create mode 100755 configs/install-iso/overlay/arch/setup diff --git a/configs/install-iso/overlay/arch/setup b/configs/install-iso/overlay/arch/setup new file mode 100755 index 0000000..e9d1660 --- /dev/null +++ b/configs/install-iso/overlay/arch/setup @@ -0,0 +1,3 @@ +#!/bin/sh +# +aif -p interactive diff --git a/configs/install-iso/packages.list b/configs/install-iso/packages.list index 66273df..0519ada 100644 --- a/configs/install-iso/packages.list +++ b/configs/install-iso/packages.list @@ -1,4 +1,3 @@ -archlinux-installer aif aufs2-util base -- 1.6.3.3
* Added ntp to packages list (Both ARCHes) * Modified Makefile to parse the CARCH related packages.$ARCH We need different lists cause not all packages exist for both arches. And it's bad to edit in the packages.list each build. Signed-off-by: Gerhard Brauer <gerbra@archlinux.de> --- configs/install-iso/Makefile | 6 ++-- configs/install-iso/packages.i686 | 43 +++++++++++++++++++++++++++++++++++ configs/install-iso/packages.list | 42 ---------------------------------- configs/install-iso/packages.x86_64 | 41 +++++++++++++++++++++++++++++++++ 4 files changed, 87 insertions(+), 45 deletions(-) create mode 100644 configs/install-iso/packages.i686 delete mode 100644 configs/install-iso/packages.list create mode 100644 configs/install-iso/packages.x86_64 diff --git a/configs/install-iso/Makefile b/configs/install-iso/Makefile index 77ed056..cfdf6e6 100644 --- a/configs/install-iso/Makefile +++ b/configs/install-iso/Makefile @@ -1,5 +1,5 @@ -ver=2009.02 -kver=2.6.28-ARCH +ver=2009.06 +kver=2.6.30-ARCH WORKDIR=work @@ -10,7 +10,7 @@ PWD:=`pwd` FTPname:=$(PWD)/archlinux-$(ver)-ftp-$(ARCH) COREname:=$(PWD)/archlinux-$(ver)-core-$(ARCH) -PACKAGES="`cat packages.list` $(BOOTLOADER)" +PACKAGES="$(shell cat packages.$(ARCH)) $(BOOTLOADER)" all: ftp-iso ftp-usb core-iso core-usb all-iso: ftp-iso core-iso diff --git a/configs/install-iso/packages.i686 b/configs/install-iso/packages.i686 new file mode 100644 index 0000000..472c89b --- /dev/null +++ b/configs/install-iso/packages.i686 @@ -0,0 +1,43 @@ +aif +aufs2-util +base +ddrescue +dmraid +dnsutils +dosfstools +elinks +gnu-netcat +grub-gfx +inetutils +intel-536ep +intel-537 +ipw2100-fw +ipw2200-fw +iwlwifi-3945-ucode +iwlwifi-4965-ucode +iwlwifi-5000-ucode +joe +lftp +lilo +memtest86+ +ndiswrapper +ndiswrapper-utils +nfs-utils +nmap +ntfs-3g +ntfsprogs +ntp +openssh +openvpn +parted +pptpclient +rt2x00-rt61-fw +rt2x00-rt71w-fw +speedtouch +squashfs-tools +tcpdump +tiacx +tiacx-firmware +wireless_tools +wlan-ng26-utils +zd1211-firmware diff --git a/configs/install-iso/packages.list b/configs/install-iso/packages.list deleted file mode 100644 index 0519ada..0000000 --- a/configs/install-iso/packages.list +++ /dev/null @@ -1,42 +0,0 @@ -aif -aufs2-util -base -ddrescue -dmraid -dnsutils -dosfstools -elinks -gnu-netcat -grub-gfx -inetutils -intel-536ep -intel-537 -ipw2100-fw -ipw2200-fw -iwlwifi-3945-ucode -iwlwifi-4965-ucode -iwlwifi-5000-ucode -joe -lftp -lilo -memtest86+ -ndiswrapper -ndiswrapper-utils -nfs-utils -nmap -ntfs-3g -ntfsprogs -openssh -openvpn -parted -pptpclient -rt2x00-rt61-fw -rt2x00-rt71w-fw -speedtouch -squashfs-tools -tcpdump -tiacx -tiacx-firmware -wireless_tools -wlan-ng26-utils -zd1211-firmware diff --git a/configs/install-iso/packages.x86_64 b/configs/install-iso/packages.x86_64 new file mode 100644 index 0000000..257a275 --- /dev/null +++ b/configs/install-iso/packages.x86_64 @@ -0,0 +1,41 @@ +aif +aufs2-util +base +ddrescue +dmraid +dnsutils +dosfstools +elinks +gnu-netcat +grub-gfx +inetutils +ipw2100-fw +ipw2200-fw +iwlwifi-3945-ucode +iwlwifi-4965-ucode +iwlwifi-5000-ucode +joe +lftp +lilo +memtest86+ +ndiswrapper +ndiswrapper-utils +nfs-utils +nmap +ntfs-3g +ntfsprogs +ntp +openssh +openvpn +parted +pptpclient +rt2x00-rt61-fw +rt2x00-rt71w-fw +speedtouch +squashfs-tools +tcpdump +tiacx +tiacx-firmware +wireless_tools +wlan-ng26-utils +zd1211-firmware -- 1.6.3.3
We set ARCH either from command line (make ARCH=i686 <target>) or dynamically from 'uname -m'. In chroots we get a problem if we not explicit set the ARCH; ex.: runnig kernel is x86_64 but we wan't to build for i686. So it may better to parse the needed ARCH from makepkg.conf->CARCH. Signed-off-by: Gerhard Brauer <gerbra@archlinux.de> --- configs/install-iso/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configs/install-iso/Makefile b/configs/install-iso/Makefile index cfdf6e6..c18abae 100644 --- a/configs/install-iso/Makefile +++ b/configs/install-iso/Makefile @@ -3,7 +3,7 @@ kver=2.6.30-ARCH WORKDIR=work -ARCH?=`uname -m` +ARCH?=$(shell grep CARCH /etc/makepkg.conf | cut -d'"' -f2) BOOTLOADER?=grub-gfx PWD:=`pwd` -- 1.6.3.3
On Tue, 30 Jun 2009 12:43:23 +0200 Gerhard Brauer <gerbra@archlinux.de> wrote:
Added a script to overlay which call aif's interactiv procedure when /arch/setup is started. Also removed old arch-installer from packages.list
Signed-off-by: Gerhard Brauer <gerbra@archlinux.de> --- configs/install-iso/overlay/arch/setup | 3 +++ configs/install-iso/packages.list | 1 - 2 files changed, 3 insertions(+), 1 deletions(-) create mode 100755 configs/install-iso/overlay/arch/setup
diff --git a/configs/install-iso/overlay/arch/setup b/configs/install-iso/overlay/arch/setup new file mode 100755 index 0000000..e9d1660 --- /dev/null +++ b/configs/install-iso/overlay/arch/setup @@ -0,0 +1,3 @@ +#!/bin/sh +# +aif -p interactive diff --git a/configs/install-iso/packages.list b/configs/install-iso/packages.list index 66273df..0519ada 100644 --- a/configs/install-iso/packages.list +++ b/configs/install-iso/packages.list @@ -1,4 +1,3 @@ -archlinux-installer aif aufs2-util base
Not sure if this is the way to go. I would try to get rid of the entire '/arch' dir alltogether as it violates the FHS. (other then archlinux-installer, only an install guide is there which should be moved to /usr/share imho) Also I don't think we should provide aliases/wrapper scripts. We'll make it clear the tool is aif and that most users will want to use `aif -p interactive` (in the release announcement + installation guide) Also, there are more changes in packages.list to be done. I can't check right now for the specifics however. Dieter
Am Dienstag, den 30.06.2009, 13:35 +0200 schrieb Dieter Plaetinck:
On Tue, 30 Jun 2009 12:43:23 +0200 Gerhard Brauer <gerbra@archlinux.de> wrote:
Added a script to overlay which call aif's interactiv procedure when /arch/setup is started. Also removed old arch-installer from packages.list
Not sure if this is the way to go. I would try to get rid of the entire '/arch' dir alltogether as it violates the FHS.
I think we don't have to care much to FHS on *our* install medium structure. I like to have all necessary tools and infos (Readme, Guides) in a common place (/arch). Also i personally would not like to type: aif -p interactive each time and would not do the same for our users.... /arch/setup is "traditionally", and it says: setup my arch system. If one would like to use other aif procedures - this is the way where he should type: aif -p foorbar
Also I don't think we should provide aliases/wrapper scripts. We'll make it clear the tool is aif and that most users will want to use `aif -p interactive` (in the release announcement + installation guide)
Hmm, intention of most ISO users is: to install Archlinux. Aif is the tool. So /arch/setup is a logical way for me... ;-)
Also, there are more changes in packages.list to be done. I can't check right now for the specifics however.
Yes, we should revisit the list. But the mainly needed packages are therein for both arches for setup. But maybe we find more which should be available directly in the live-cd environment (Remember: our argument against too much additional packages were: one could easily install them via pacman...)
Dieter
Gerhard
We only want the right-side value from CARCH=, avoid problems when CARCH is referenced also in a commet or so.... Signed-off-by: Gerhard Brauer <gerbra@archlinux.de> --- configs/install-iso/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configs/install-iso/Makefile b/configs/install-iso/Makefile index c18abae..9badb24 100644 --- a/configs/install-iso/Makefile +++ b/configs/install-iso/Makefile @@ -3,7 +3,7 @@ kver=2.6.30-ARCH WORKDIR=work -ARCH?=$(shell grep CARCH /etc/makepkg.conf | cut -d'"' -f2) +ARCH?=$(shell grep '^CARCH=' /etc/makepkg.conf | cut -d'"' -f2) BOOTLOADER?=grub-gfx PWD:=`pwd` -- 1.6.3.3
2009/6/30 Gerhard Brauer <gerbra@archlinux.de>:
We only want the right-side value from CARCH=, avoid problems when CARCH is referenced also in a commet or so....
Signed-off-by: Gerhard Brauer <gerbra@archlinux.de> --- configs/install-iso/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/configs/install-iso/Makefile b/configs/install-iso/Makefile index c18abae..9badb24 100644 --- a/configs/install-iso/Makefile +++ b/configs/install-iso/Makefile @@ -3,7 +3,7 @@ kver=2.6.30-ARCH
WORKDIR=work
-ARCH?=$(shell grep CARCH /etc/makepkg.conf | cut -d'"' -f2) +ARCH?=$(shell grep '^CARCH=' /etc/makepkg.conf | cut -d'"' -f2) BOOTLOADER?=grub-gfx
PWD:=`pwd` -- 1.6.3.3
Sourcing makepkg.conf would directly give access to CARCH. -- Abhishek
Am Dienstag, den 30.06.2009, 17:59 +0530 schrieb Abhishek Dasgupta:
Sourcing makepkg.conf would directly give access to CARCH.
Hmm, this is a Makefile (called by make). AFAIK souring therein is not possible.... (I don't know..) Gerhard
On Tue, Jun 30, 2009 at 2:35 PM, Gerhard Brauer<gerbra@archlinux.de> wrote:
Am Dienstag, den 30.06.2009, 17:59 +0530 schrieb Abhishek Dasgupta:
Sourcing makepkg.conf would directly give access to CARCH.
Hmm, this is a Makefile (called by make). AFAIK souring therein is not possible.... (I don't know..)
I am no expert on Makefiles, but ARCH?=$(shell source /etc/makepkg.conf; echo "$$CARCH") seems to work. Henning
Am Dienstag, den 30.06.2009, 15:49 +0200 schrieb Henning Garus:
I am no expert on Makefiles, but
ARCH?=$(shell source /etc/makepkg.conf; echo "$$CARCH")
seems to work.
Yes, i think this is cleaner code than mine in the "patched patch" ;-) Thanks. If we apply (Aaron?) the 3. and 4. patch we should do it this way.
Henning
Gerhard
Am Dienstag, den 30.06.2009, 16:06 +0200 schrieb Gerhard Brauer:
Am Dienstag, den 30.06.2009, 15:49 +0200 schrieb Henning Garus:
I am no expert on Makefiles, but
ARCH?=$(shell source /etc/makepkg.conf; echo "$$CARCH")
seems to work.
Yes, i think this is cleaner code than mine in the "patched patch" ;-) Thanks. If we apply (Aaron?) the 3. and 4. patch we should do it this way.
I "found" linux32 and linux64 commands ;-) Using linux32 chroot /foobar wraps the output of uname -m to i686 on an x86_64. linux32 uname -m So we have no need to apply this patch (3 and 4), we could leave the old code: ARCH?=`uname -m` in the Makefile. Gerhard
On Tue, 30 Jun 2009 13:59:35 +0200 Gerhard Brauer <gerbra@archlinux.de> wrote:
Am Dienstag, den 30.06.2009, 13:35 +0200 schrieb Dieter Plaetinck:
On Tue, 30 Jun 2009 12:43:23 +0200 Gerhard Brauer <gerbra@archlinux.de> wrote:
Added a script to overlay which call aif's interactiv procedure when /arch/setup is started. Also removed old arch-installer from packages.list
Not sure if this is the way to go. I would try to get rid of the entire '/arch' dir alltogether as it violates the FHS.
I think we don't have to care much to FHS on *our* install medium structure. I like to have all necessary tools and infos (Readme, Guides) in a common place (/arch). Also i personally would not like to type: aif -p interactive each time and would not do the same for our users.... /arch/setup is "traditionally", and it says: setup my arch system. If one would like to use other aif procedures - this is the way where he should type: aif -p foorbar
Also I don't think we should provide aliases/wrapper scripts. We'll make it clear the tool is aif and that most users will want to use `aif -p interactive` (in the release announcement + installation guide)
Hmm, intention of most ISO users is: to install Archlinux. Aif is the tool. So /arch/setup is a logical way for me... ;-)
Also, there are more changes in packages.list to be done. I can't check right now for the specifics however.
Yes, we should revisit the list. But the mainly needed packages are therein for both arches for setup. But maybe we find more which should be available directly in the live-cd environment (Remember: our argument against too much additional packages were: one could easily install them via pacman...)
Dieter
Gerhard
Allright. fine.
participants (4)
-
Abhishek Dasgupta
-
Dieter Plaetinck
-
Gerhard Brauer
-
Henning Garus