system/iso
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated kernel to 4.4.30, UEFI and 3.2 -> 3.3 text updates, inject xorg-libxfont2

Browse Source
This commit is contained in:
Matt Housh 2016-11-17 14:44:02 -06:00
parent 6e7bdc1bb9
commit 785e2b2f41
14 changed files with 42 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -3,11 +3,11 @@
# Copyright (c) 2003-2005 Per Liden <per@fukt.bth.se> # Copyright (c) 2003-2005 Per Liden <per@fukt.bth.se>
# #
CRUXVERSION = 3.2 CRUXVERSION = 3.3
CUSTOMVERSION = CUSTOMVERSION =
COLLECTIONS = core opt xorg COLLECTIONS = core opt xorg
KERNEL_MIRROR = http://www.kernel.org KERNEL_MIRROR = http://www.kernel.org
KERNEL_VERSION = 4.4.27 KERNEL_VERSION = 4.4.30
KERNEL_PATCHES = KERNEL_PATCHES =
BB_VERSION = 1.22.1 BB_VERSION = 1.22.1
MEMTEST_VERSION = 5.01 MEMTEST_VERSION = 5.01

16
doc/handbook/get_wiki_handbook
View File

@ -4,21 +4,21 @@
INFILE=handbook.in INFILE=handbook.in
OUTFILE=handbook.txt OUTFILE=handbook.txt
CRUX_VERSION=3.2 CRUX_VERSION=3.3
TITLE="HANDBOOK FOR CRUX $CRUX_VERSION" TITLE="HANDBOOK FOR CRUX $CRUX_VERSION"
URL="http://crux.nu/Main/Handbook${CRUX_VERSION/\./-}?action=print" URL="http://crux.nu/Main/Handbook${CRUX_VERSION/\./-}?action=print"
set -x set -x
links -no-numbering -no-references -dump $URL > $INFILE links -no-numbering -no-references -dump $URL > $INFILE
cat $INFILE|while read n; do cat $INFILE|while read n; do
if [ -n "$intext" ]; then if [ -n "$intext" ]; then
cat cat
elif [ "$n" = "1. Preface" ]; then elif [ "$n" = "1. Preface" ]; then
echo "$TITLE" echo "$TITLE"
echo ""; echo "";
echo " $n"; echo " $n";
intext="yes"; intext="yes";
fi fi
done > $OUTFILE done > $OUTFILE
rm $INFILE rm $INFILE

12
doc/handbook/get_wiki_release_notes
View File

@ -4,17 +4,17 @@
INFILE=releasenotes.in INFILE=releasenotes.in
OUTFILE=releasenotes.txt OUTFILE=releasenotes.txt
CRUX_VERSION=3.2 CRUX_VERSION=3.3
URL="http://crux.nu/Main/ReleaseNotes${CRUX_VERSION//\./-}?action=print" URL="http://crux.nu/Main/ReleaseNotes${CRUX_VERSION//\./-}?action=print"
set -x set -x
links -no-numbering -no-references -dump $URL > $INFILE links -no-numbering -no-references -dump $URL > $INFILE
cat $INFILE|while read n; do cat $INFILE|while read n; do
if [ -n "$intext" ]; then if [ -n "$intext" ]; then
cat cat
elif [ "$n" = "Main: ReleaseNotes${CRUX_VERSION//\./-}" ]; then elif [ "$n" = "Main: ReleaseNotes${CRUX_VERSION//\./-}" ]; then
intext="yes"; intext="yes";
fi fi
done > $OUTFILE done > $OUTFILE
rm $INFILE rm $INFILE

2
initramfs/init
View File

@ -131,7 +131,7 @@ find_and_mount_media() {
# main script # main script
echo "" echo ""
echo -e "${BOLD}CRUX 3.2 - ${BLUE}http://crux.nu/${NORM}" echo -e "${BOLD}CRUX 3.3 - ${BLUE}http://crux.nu/${NORM}"
echo "" echo ""
exec >/dev/console </dev/console 2>&1 exec >/dev/console </dev/console 2>&1

4
iso/bin/setup
View File

@ -20,7 +20,7 @@
# USA. # USA.
# #
VERSION="3.2" VERSION="3.3"
do_dialog() { do_dialog() {
dialog --backtitle "CRUX $VERSION Setup" --no-shadow "$@" dialog --backtitle "CRUX $VERSION Setup" --no-shadow "$@"
@ -304,7 +304,7 @@ main() {
if [ "$ACTION" = "UPGRADE" ] && [ -f /usr/bin/setup-helper ] if [ "$ACTION" = "UPGRADE" ] && [ -f /usr/bin/setup-helper ]
then then
(/usr/bin/setup-helper $ROOT &> $helperlogfile) | do_dialog \ (/usr/bin/setup-helper $ROOT &> $helperlogfile) | do_dialog \
--title " Please wait [3.1 -> 3.2 check]" --gauge "" 8 60 0 --title " Please wait [3.2 -> 3.3 check]" --gauge "" 8 60 0
fi fi
install_packages install_packages

4
iso/bin/setup-chroot
View File

@ -6,4 +6,8 @@ mount -t proc proc /mnt/proc
mount -t sysfs none /mnt/sys mount -t sysfs none /mnt/sys
mount -t devpts -o noexec,nosuid,gid=tty,mode=0620 devpts /mnt/dev/pts mount -t devpts -o noexec,nosuid,gid=tty,mode=0620 devpts /mnt/dev/pts
if grep -qs /sys/firmware/efi/efivars /proc/mounts; then
mount --bind /sys/firmware/efi/efivars /mnt/sys/firmware/efi/efivars
fi
chroot /mnt /bin/bash chroot /mnt /bin/bash

27
iso/bin/setup-helper
View File

@ -94,30 +94,15 @@ if [ -z "$1" ]; then
fi fi
##### # 3.1 -> 3.2 ##### ##### # 3.2 -> 3.3 #####
echo "* CRUX 3.1 -> 3.2 setup-helper" echo "* CRUX 3.2 -> 3.3 setup-helper"
if [ `is_installed xorg-server` ]; then inject_packages signify
inject_packages libepoxy
fi
if [ `is_installed firefox` ]; then if [ `is_installed firefox` ]; then
inject_packages gstreamer gst-plugins-base inject_packages autoconf-2.13
inject_packages gtk3 at-spi2-core at-spi2-atk dbus
fi fi
if [ `is_installed wpa_supplicant` ]; then if [ `is_installed xorg-server` ]; then
inject_packages dbus inject_packages xorg-libxfont2
fi fi
if [ `is_installed xorg-xf86-input-evdev` ]; then
inject_packages mtdev
fi
if [ `is_installed mesa3d` ]; then
inject_packages xorg-libxxf86vm
fi
remove_packages xorg-glamor-egl
inject_packages dash gperf start-stop-daemon

1
iso/etc/fstab
View File

@ -1,3 +1,4 @@
#CRUXMEDIA# /media auto ro 0 0 #CRUXMEDIA# /media auto ro 0 0
devpts /dev/pts devpts noexec,nosuid,gid=tty,mode=0620 0 0 devpts /dev/pts devpts noexec,nosuid,gid=tty,mode=0620 0 0
tmpfs /tmp tmpfs defaults 0 0 tmpfs /tmp tmpfs defaults 0 0
none /sys/firmware/efi/efivars efivarfs defaults,noauto 0 0

2
iso/etc/motd
View File

@ -1,3 +1,3 @@
Welcome to the CRUX 3.2 installation media! Welcome to the CRUX 3.3 installation media!

5
iso/etc/rc
View File

@ -31,4 +31,9 @@ hostname crux
# Setup network # Setup network
/sbin/ifconfig lo 127.0.0.1 /sbin/ifconfig lo 127.0.0.1
# mount efivarfs if possible
if [ -d /sys/firmware/efi/efivars ]; then
/bin/mount /sys/firmware/efi/efivars &> /dev/null
fi
# End of file # End of file

2
iso/grub.cfg
View File

@ -8,7 +8,7 @@ set menu_color_highlight=white/cyan
search --file --no-floppy --set root /crux-media search --file --no-floppy --set root /crux-media
set prefix=($root)/boot/grub set prefix=($root)/boot/grub
menuentry "Install/Upgrade CRUX 3.2 (UEFI mode)" { menuentry "Install/Upgrade CRUX 3.3 (UEFI mode)" {
insmod efi_uga insmod efi_uga
insmod efi_gop insmod efi_gop
set gfxmode=auto set gfxmode=auto

2
iso/isolinux/boot.msg
View File

@ -1,4 +1,4 @@
Welcome to the CRUX 3.2 installation media! Welcome to the CRUX 3.3 installation media!
Press <Enter> to boot using the default 'CRUX' image Press <Enter> to boot using the default 'CRUX' image
or use one of the others in the following list: or use one of the others in the following list:

4
kernel/linux-4.4.27.config → kernel/linux-4.4.30.config
View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/x86 4.4.27 Kernel Configuration # Linux/x86 4.4.30 Kernel Configuration
# #
CONFIG_64BIT=y CONFIG_64BIT=y
CONFIG_X86_64=y CONFIG_X86_64=y
@ -2670,7 +2670,7 @@ CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
# #
# EFI (Extensible Firmware Interface) Support # EFI (Extensible Firmware Interface) Support
# #
CONFIG_EFI_VARS=m # CONFIG_EFI_VARS is not set
CONFIG_EFI_ESRT=y CONFIG_EFI_ESRT=y
# CONFIG_EFI_FAKE_MEMMAP is not set # CONFIG_EFI_FAKE_MEMMAP is not set
CONFIG_EFI_RUNTIME_WRAPPERS=y CONFIG_EFI_RUNTIME_WRAPPERS=y

4
kernel/linux-4.4.27.defconfig → kernel/linux-4.4.30.defconfig
View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/x86 4.4.27 Kernel Configuration # Linux/x86 4.4.30 Kernel Configuration
# #
CONFIG_64BIT=y CONFIG_64BIT=y
CONFIG_X86_64=y CONFIG_X86_64=y
@ -2802,7 +2802,7 @@ CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
# #
# EFI (Extensible Firmware Interface) Support # EFI (Extensible Firmware Interface) Support
# #
CONFIG_EFI_VARS=m # CONFIG_EFI_VARS is not set
CONFIG_EFI_ESRT=y CONFIG_EFI_ESRT=y
# CONFIG_EFI_FAKE_MEMMAP is not set # CONFIG_EFI_FAKE_MEMMAP is not set
CONFIG_EFI_RUNTIME_WRAPPERS=y CONFIG_EFI_RUNTIME_WRAPPERS=y