Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=9899853084da93282c18eb8b8ac41fbb6aed3450
commit 9899853084da93282c18eb8b8ac41fbb6aed3450
Author: Janny <[EMAIL PROTECTED]>
Date: Fri Feb 15 16:22:53 2008 +0100
fwlive
* correction in instals sort order
* remove lirc-fwlive from config
diff --git a/Makefile b/Makefile
index 047969b..486630b 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ REMOVE_FILES =
/etc/rc.d/rcS.d/S{19rc.bootclean,07rc.frugalware} \
/etc/frugalware-release
CC = cc
-all: checkroot check-tree checkfiles chroot-mkdirs create-pkgdb cache-mount
install-base install-apps install-kernel cache-umount install-files patch-files
remove-files create-symlinks create-files fix-files create-users live-base
hacking-kdmrc kill-packages create
+all: checkroot check-tree checkfiles chroot-mkdirs create-pkgdb cache-mount
install-base install-kernel install-apps cache-umount install-files patch-files
remove-files create-symlinks create-files fix-files create-users live-base
hacking-kdmrc kill-packages create
@echo "Finally, we do nothing more by now."
@echo "Now burn your iso and have fun!"
@@ -91,7 +91,7 @@ install-base: checkroot
install-apps: checkroot
if [ "${INST_${APPSGROUP}_APPS}" ] ; then \
- if (( $(shell pacman-g2 -r ${CHROOTDIR}/${TREE} -Q
kernel-fwlive &>/dev/null; echo $$?) > 0 )) ; then \
+ if (( $(shell pacman-g2 -r ${CHROOTDIR}/${TREE} -Qs
${INST_${APPSGROUP}_APPS} &>/dev/null; echo $$?) < 1 )) ; then \
pacman-g2 -r ${CHROOTDIR}/${TREE} -Sf ${INST_${APPSGROUP}_APPS} --noconfirm
--config ${PACCONF} ; \
fi ; \
fi
diff --git a/config b/config
index 37907ab..d4ba49f 100644
--- a/config
+++ b/config
@@ -67,10 +67,10 @@ SAVEDIRS = etc home lib root usr var
CONFIG_SETUP = y
# additional packages to be installed by the profiles
-# no builded pkgs: rt2500-fwlive rt2400-fwlive acx100-fwlive
+# no builded pkgs: rt2500-fwlive rt2400-fwlive acx100-fwlive lirc-fwlive
DRIVERS = ndiswrapper-fwlive ipw2200-firmware gspcav1-fwlive \
qc-usb-fwlive truecrypt-fwlive dazuko-fwlive \
- busybox-fwlive lirc-fwlive acerhk-fwlive madwifi-fwlive \
+ busybox-fwlive acerhk-fwlive madwifi-fwlive \
wlan-ng-fwlive adm8211-fwlive ipw3945-fwlive kqemu-fwlive
INST_MUSTHAVE_APPS = busybox-fwlive util-linux grub-theme-fwlive \
sudo aufs squashfs cdrtools ntfs-3g
@@ -92,7 +92,7 @@ INST_LOCALE_APPS = firefox-hu firefox-de firefox-fr \
kde-i18n-hu kde-i18n-de kde-i18n-fr firefox-da kde-i18n-da
openoffice.org-i18n-da \
openoffice.org-dict-hu openoffice.org-dict-fr openoffice.org-dict-de \
openoffice.org-i18n-hu openoffice.org-i18n-de openoffice.org-i18n-fr \
- bibletime-i18n k3b-i18n
+ bibletime-i18n k3b-i18n
INST_LOCALE_GTK_APPS = firefox-hu firefox-de firefox-fr firefox-da
openoffice.org-i18n-da \
openoffice.org-dict-hu openoffice.org-dict-fr openoffice.org-dict-de \
openoffice.org-i18n-hu openoffice.org-i18n-de openoffice.org-i18n-fr
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
