Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=7b35fd11051f35f0d97d26b2176bb9cf3d3f0922
commit 7b35fd11051f35f0d97d26b2176bb9cf3d3f0922
Author: Devil505 <devil505li...@gmail.com>
Date: Fri Oct 28 16:34:44 2011 +0200
* fixing several stuff
diff --git a/Makefile b/Makefile
index 0738ca4..49f859d 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ ARCH = $(shell uname -m)
CHROOTDIR = $(shell source /etc/makepkg.conf; echo $$CHROOTDIR)/fwlive
PACCONF := $(shell mktemp)
FWLSLANG = $(shell echo $(FWLLLANG)|sed 's/_.*//')
-KERNVER = pacman-g2 -r ${CHROOTDIR}/${TREE} -Q kernel-fwlive|cut -d ' '
-f2|sed 's/-/-fw/'
+KERNVER = pacman-g2 -r ${CHROOTDIR}/${TREE} -Q kernel|cut -d ' ' -f2|sed
's/-/-fw/'
GLIBCVER = pacman-g2 -r ${CHROOTDIR}/${TREE} -Q glibc|sed 's/.* \(.*\)-.*/\1/'
FWLREL = pacman-g2 -r ${CHROOTDIR}/${TREE} -Q frugalware |sed 's/.*
\(.*\)-.*/\1/'
ifeq ($(CONFIG_SETUP),y)
@@ -98,8 +98,8 @@ install-apps: checkroot
fi
install-kernel: checkroot
- if (( $(shell pacman-g2 -r ${CHROOTDIR}/${TREE} -Q kernel-fwlive
&>/dev/null; echo $$?) > 0 )) ; then \
- pacman-g2 -r ${CHROOTDIR}/${TREE} -Sf kernel-fwlive --noconfirm
--config ${PACCONF} ; \
+ if (( $(shell pacman-g2 -r ${CHROOTDIR}/${TREE} -Q kernel &>/dev/null;
echo $$?) > 0 )) ; then \
+ pacman-g2 -r ${CHROOTDIR}/${TREE} -Sf kernel --noconfirm
--config ${PACCONF} ; \
fi
install-files: checkroot
diff --git a/config b/config
index 1dfbf81..356d16d 100644
--- a/config
+++ b/config
@@ -69,12 +69,11 @@ SAVEDIRS = etc home lib root usr var
CONFIG_SETUP = y
# additional packages to be installed by the profiles
-# no builded pkgs: truecrypt-fwlive acerhk-fwlive lirc-fwlive
-DRIVERS = gspcav1-fwlive qc-usb-fwlive dazuko-fwlive busybox-fwlive \
- redirfs-fwlive madwifi-fwlive wlan-ng-fwlive busybox-fwlive \
- ndiswrapper-fwlive kqemu-fwlive acx100-fwlive
-INST_MUSTHAVE_APPS = busybox-fwlive util-linux-ng grub-theme-fwlive \
- sudo aufs squashfs cdrtools ntfs-3g
+# no builded pkgs: truecrypt acerhk lirc
+DRIVERS = busybox madwifi wlan-ng busybox \
+ ndiswrapper acx100 linux-firmware
+INST_MUSTHAVE_APPS = busybox util-linux-ng grub-theme-frugalware \
+ sudo squashfs cdrtools ntfs-3g
ifneq ($(ARCH),x86_64)
INST_MUSTHAVE_APPS += memtest86+
endif
@@ -86,9 +85,9 @@ INST_MIN_APPS = ${INST_MUSTHAVE_APPS} ${DRIVERS} openssh mc
wget lynx nmap \
INST_SERVER_APPS = ${INST_MIN_APPS} ncftp fuseftp postfix mysql libmysqlclient \
php php-cgi apache pure-ftpd phpmyadmin samba dhcp dhcpcd lighttpd fcgi
INST_X_APPS = xorg-server xorg-drivers xorg-fonts fvwm mplayer alsa-utils
-INST_EXTRA_APPS = gimp geeqie wireshark kaffeine kasablanca ktorrent
+INST_EXTRA_APPS = gimp geeqie wireshark kaffeine ktorrent
INST_EXTRA_GTK_APPS = gimp wireshark gqview transmission
-INST_LOCALE_APPS = firefox-{${LOCALE}} kde-l10-{${LOCALE}} \
+INST_LOCALE_APPS = firefox-{${LOCALE}} kde-l10n-{${LOCALE}} \
libreoffice-l10n-{${LOCALE}} k3b
INST_LOCALE_GTK_APPS = firefox-{${LOCALE}} libreoffice-l10-{${LOCALE}}
INST_KDE_APPS = ${INST_MIN_APPS} ${INST_X_APPS} kdebase libreoffice-kde firefox
kmplayer \
diff --git a/menu.lst b/menu.lst
index b51cf1d..f012478 100644
--- a/menu.lst
+++ b/menu.lst
@@ -3,16 +3,16 @@ timeout=5
gfxmenu /boot/grub/message
title @GRUBTITLE@
- kernel /boot/vmlinuz initrd=/boot/initrd.gz init=linuxrc max_loop=255
load_ramdisk=1 prompt_ramdisk=0 ramdisk_size=19742 rw root=/dev/ram
- initrd /boot/initrd.gz
+ kernel /boot/vmlinuz initrd=/boot/initrd.img.xz init=linuxrc
max_loop=255 load_ramdisk=1 prompt_ramdisk=0 ramdisk_size=19742 rw root=/dev/ram
+ initrd /boot/initrd.img.xz
title @GRUBTITLE@ Copy to RAM
- kernel /boot/vmlinuz initrd=/boot/initrd.gz init=linuxrc max_loop=255
load_ramdisk=1 prompt_ramdisk=0 ramdisk_size=19742 rw root=/dev/ram noresume
copy2ram
- initrd /boot/initrd.gz
+ kernel /boot/vmlinuz initrd=/boot/initrd.img.xz init=linuxrc
max_loop=255 load_ramdisk=1 prompt_ramdisk=0 ramdisk_size=19742 rw
root=/dev/ram noresume copy2ram
+ initrd /boot/initrd.img.xz
title @GRUBTITLE@ Failsafe
- kernel /boot/vmlinuz initrd=/boot/initrd.gz init=linuxrc max_loop=255
load_ramdisk=1 prompt_ramdisk=0 ramdisk_size=19742 rw root=/dev/ram showopts
ide=nodma apm=off acpi=off vga=normal noresume selinux=0 barrier=off nosmp
noapic maxcpus=0
- initrd /boot/initrd.gz
+ kernel /boot/vmlinuz initrd=/boot/initrd.img.xz init=linuxrc
max_loop=255 load_ramdisk=1 prompt_ramdisk=0 ramdisk_size=19742 rw
root=/dev/ram showopts ide=nodma apm=off acpi=off vga=normal noresume selinux=0
barrier=off nosmp noapic maxcpus=0
+ initrd /boot/initrd.img.xz
title Memtest86+
kernel /boot/memtest.bin
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
