diff options
| -rwxr-xr-x | adelie-build-cd | 28 | ||||
| -rw-r--r-- | adelie-build-cd.8 | 10 | ||||
| -rw-r--r-- | disk-label | bin | 2351 -> 2351 bytes | |||
| -rw-r--r-- | packages/arch/pmmx (renamed from packages-pmmx) | 0 | ||||
| -rw-r--r-- | packages/arch/ppc (renamed from packages-ppc) | 0 | ||||
| -rw-r--r-- | packages/arch/ppc64 (renamed from packages-ppc64) | 0 | ||||
| -rw-r--r-- | packages/arch/x86_64 (renamed from packages-x86_64) | 0 | ||||
| -rw-r--r-- | packages/base (renamed from packages) | 0 | ||||
| -rwxr-xr-x | post/arch/pmmx.sh (renamed from post-pmmx.sh) | 0 | ||||
| -rw-r--r-- | post/arch/ppc.sh (renamed from post-ppc.sh) | 0 | ||||
| -rwxr-xr-x | post/arch/ppc64.sh (renamed from post-ppc64.sh) | 0 | ||||
| -rwxr-xr-x | post/arch/x86_64.sh (renamed from post-x86_64.sh) | 0 |
12 files changed, 21 insertions, 17 deletions
diff --git a/adelie-build-cd b/adelie-build-cd index 465bd02..ee09405 100755 --- a/adelie-build-cd +++ b/adelie-build-cd @@ -1,7 +1,7 @@ #!/bin/sh -e def_arch=$(uname -m) -def_ver="1.0-beta4" +def_ver="1.0" declare -r PROGNAME=$(basename $0) @@ -143,9 +143,9 @@ clean_dirs() { install_pkgs() { header "Installing base system to squash root..." - declare -r PACKAGES=$(cat packages 2>/dev/null || fatal 'No core packages specified') - declare -r ARCH_PKGS=$(cat packages-$ARCH 2>/dev/null || echo '') - declare -r KIND_PKGS=$(cat packages-$KIND 2>/dev/null || echo '') + declare -r PACKAGES=$(cat packages/base 2>/dev/null || fatal 'No core packages specified') + declare -r ARCH_PKGS=$(cat packages/arch/$ARCH 2>/dev/null || echo '') + declare -r KIND_PKGS=$(cat packages/kind/$KIND 2>/dev/null || echo '') mkdir -p squashroot-$ARCH/etc/apk/keys cp 'packages@adelielinux.org.pub' squashroot-$ARCH/etc/apk/keys/ @@ -183,12 +183,11 @@ make_structure() { squashroot-$ARCH/etc/runlevels/boot/$bootservice done - if [ -f services-$KIND ]; then - for service in $(cat services-$KIND 2>/dev/null || echo ''); do - ln -s /etc/init.d/$service \ - sqaushroot-$ARCH/etc/runlevels/default/$service - done - fi + for service in $(cat services/base 2>/dev/null || echo '') + $(cat services/kind/$KIND 2>/dev/null || echo ''); do + ln -s /etc/init.d/$service \ + sqaushroot-$ARCH/etc/runlevels/default/$service + done cat >squashroot-$ARCH/etc/fstab <<- FSTAB # Welcome to Adélie Linux. @@ -308,9 +307,14 @@ make_initrd() { } prepare_cdroot() { - if test -f post-$ARCH.sh; then + if test -f post/arch/$ARCH.sh; then header 'Running architecture-specific scripts...' - sh post-$ARCH.sh + sh post/arch/$ARCH.sh + fi + + if test -f post/kind/$KIND.sh; then + header "Running $KIND script..." + sh post/kind/$KIND.sh fi header 'Adding kernel...' diff --git a/adelie-build-cd.8 b/adelie-build-cd.8 index 26489d2..885e29e 100644 --- a/adelie-build-cd.8 +++ b/adelie-build-cd.8 @@ -89,10 +89,10 @@ is not specified. Kinds are a specific set of packages and optional startup scripts that define a specific 'kind' of CD image. Official Kinds include Horizon, KDE Live, and MATE Live. You can specify your own by creating a -.Pa packages-$KIND +.Pa packages/kind/$KIND file containing the names of packages you wish (one per line). Additionally, you may optionally create a -.Pa services-$KIND +.Pa services/kind/$KIND file containing the names of services to start up in the default runlevel (one per line). .Sh ENVIRONMENT @@ -120,7 +120,7 @@ A list of additional parameters to provide to when generating the ISO image for the specified architecture. This is used to specify the correct layout for bootable discs on that architecture. .Pp -.It Pa packages-$ARCH +.It Pa packages/arch/$ARCH A list of architecture-specific packages to install on the created media, in addition to the default packages installed on every architecture. This is typically used for bootloaders and firmware manipulation packages. It can also @@ -130,7 +130,7 @@ or .Xr strace 1 and so on) on architectures that are still experimental. .Pp -.It Pa post-$ARCH.sh +.It Pa post/arch/$ARCH.sh If this file exists and is executable, it will be run just before .Xr mkisofs 8 to do any final preparation to the disc root before creating the image. @@ -140,7 +140,7 @@ adelie-build-cd -a x86_64 .Pp LDARCH=powerpc adelie-build-cd -a ppc .Pp -EXTRA_MIRROR=i525 LDARCH=i386 SIGNING_KEY=/etc/portage/adelie.key ./build-cd -a x86 +LDARCH=i386 SIGNING_KEY=/etc/portage/adelie.key ./adelie-build-cd -a pmmx .Sh SEE ALSO .Xr mksquashfs 1 , .Xr apk 8 , Binary files differdiff --git a/packages-pmmx b/packages/arch/pmmx index 01b1b70..01b1b70 100644 --- a/packages-pmmx +++ b/packages/arch/pmmx diff --git a/packages-ppc b/packages/arch/ppc index 87a20f4..87a20f4 100644 --- a/packages-ppc +++ b/packages/arch/ppc diff --git a/packages-ppc64 b/packages/arch/ppc64 index c8d667f..c8d667f 100644 --- a/packages-ppc64 +++ b/packages/arch/ppc64 diff --git a/packages-x86_64 b/packages/arch/x86_64 index 01b1b70..01b1b70 100644 --- a/packages-x86_64 +++ b/packages/arch/x86_64 diff --git a/post-pmmx.sh b/post/arch/pmmx.sh index e68e387..e68e387 100755 --- a/post-pmmx.sh +++ b/post/arch/pmmx.sh diff --git a/post-ppc.sh b/post/arch/ppc.sh index 2c4fe64..2c4fe64 100644 --- a/post-ppc.sh +++ b/post/arch/ppc.sh diff --git a/post-ppc64.sh b/post/arch/ppc64.sh index dd4a5b9..dd4a5b9 100755 --- a/post-ppc64.sh +++ b/post/arch/ppc64.sh diff --git a/post-x86_64.sh b/post/arch/x86_64.sh index 3117f86..3117f86 100755 --- a/post-x86_64.sh +++ b/post/arch/x86_64.sh |