PERFORCE change 81493 for review

[soc-saturnero]

http://perforce.freebsd.org/chv.cgi?CH=81493

Change 81493 by soc-saturnero at soc-saturnero_sberta on 2005/08/05 13:54:25

	Adding pkgselect target. This target is independent from others and launch an interactive dialog to choose packages to install

Affected files ...

.. //depot/projects/soc2005/freesbie/Makefile#8 edit
.. //depot/projects/soc2005/freesbie/ToDo#6 edit
.. //depot/projects/soc2005/freesbie/conf/freesbie.defaults.conf#8 edit
.. //depot/projects/soc2005/freesbie/scripts/pkgselect.sh#1 add

Differences ...

==== //depot/projects/soc2005/freesbie/Makefile#8 (text+ko) ====

@@ -4,11 +4,23 @@
 # See COPYING for licence terms.
 #
 # $FreeBSD$
+#
+# FreeSBIE makefile. Main targets are:
+#
+# iso:		build an iso image
+# img:		build a loopback image 
+# flash:	copy the built system on a device (interactive)
+# freesbie:	same of `iso'
+#
+# pkgselect:	choose packages to include in the built system (interactive)
 
 all: freesbie
 
 freesbie: iso
 
+pkgselect:
+	@sh ./scripts/launch.sh pkgselect
+
 buildworld: .done_buildworld
 .done_buildworld:
 	@-rm -f .tmp_buildworld

==== //depot/projects/soc2005/freesbie/ToDo#6 (text+ko) ====

@@ -3,10 +3,13 @@
 - Add a new target (patch?) for
 	- creating loader.conf
 	- creating rc.conf
+(Really needed?)
 
+- Package install target (remember the check $ARCH == `uname -m`)
+- Extra stuff
+ - Add a customroot plugin like the files/custom feature in freesbie1
 
-- Package management
-- Extra stuff
+
 
 List of files to be created:
 
@@ -16,24 +19,12 @@
 
    #Configuration file used in the build phase
    conf/
-      make.conf
-      make.conf.minimal
-      FREESBIE.${ARCH} # Kernel configuration
 
    #Build scripts, invoked from Makefile
    scripts/
-      buildworld
-      installworld
-      [...]
-      extra.sh #Runs requested extra scripts.
-      preparefs
-      buildiso
-      buildimage
+      packages
+      extra #Runs requested extra scripts.
 
-      #Optionally, override scripts depending on the built architecture
-      ${ARCH}/ #e.g. powerpc
-         buildiso
-
    #Architecture-dependent list needed?
    customroot/
       etc/
@@ -46,6 +37,8 @@
    # need to find a nice solution to make the user select which tools
    # has to be inserted
 
+   # The easiest way is to set a variable in freesbie.conf
+
    extra/
       carddetect.sh
       carddetect/ #Files needed by carddetect.sh script
@@ -54,3 +47,4 @@
           bsdinstaller.sh
           bsdinstaller/ # Files needed by bsdinstaller.sh
 
+      customroot.sh

==== //depot/projects/soc2005/freesbie/conf/freesbie.defaults.conf#8 (text+ko) ====

@@ -10,6 +10,8 @@
 #
 # Don't modify it, create your own freesbie.conf instead.
 
+# Variables
+
 # Path where files are installed.
 BASEDIR="/usr/local/freesbie-fs"
 
@@ -46,6 +48,28 @@
 #
 #MAKE_CONF=/etc/make.conf
 
+# You can specify which files to add to your system one by one. Just
+# put the list in a text file and set the absolute path in FILE_LIST
+# variable
+#
+#FILE_LIST=/my/own/file_list.txt
+
+# You can specify which files to remove from your built system. Just
+# put the list in a text file and set the absolute path in PRUNE_LIST
+# variable. Wildcards are also accepted
+#
+#PRUNE_LIST=/my/own/prune_em_all.txt
+
+# Set PKGFILE variable to a text file containing a list of packages to
+# install in the built system. This file can be either a pkg_info(1)
+# like output either a list of packages without version number. Please
+# note that this file will be rewritten if you run `make pkgselect'
+#
+#PKGFILE=/my/own/pkg_info_output.txt
+
+
+# Knobs
+
 # Define MINIMAL to build a minimal world (i.e.: use
 # make.conf.minimal, full of NO_* knobs.
 #
@@ -69,5 +93,5 @@
 # Define NO_UNIONFS if you want to avoid using unionfs in the built
 # system
 #
-#NO_UNIONFS=YES
+NO_UNIONFS=YES # Unionfs is broken in > 6.0, so disable it by default