CMXSL.org/package-helpers-cmxsl
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated taskel, debian-installer and apt-setup for netinst image release

Browse source
This commit is contained in:
Rubén Rodríguez 2013-02-11 22:24:31 +01:00
parent 93479583b1
commit 6d7c97da38
11 changed files with 22 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
helpers/DATA/tasksel/dns-server
View file

@ -2,6 +2,6 @@ Task: dns-server
Section: server
Description: Bind9 DNS server
Selects the BIND DNS server and its documentation.
Packages: list
Key:
bind9
Packages: task-fields

2
helpers/DATA/tasksel/mail-server
View file

@ -3,6 +3,6 @@ Section: server
Description: Postfix mail server
This task selects a variety of package useful for a general purpose mail
server system.
Packages: list
Key:
postfix
Packages: task-fields

2
helpers/DATA/tasksel/openssh-server
View file

@ -2,6 +2,6 @@ Task: openssh-server
Section: server
Description: OpenSSH secure shell server
Selects packages needed for an OpenSSH server.
Packages: list
Key:
openssh-server
Packages: task-fields

2
helpers/DATA/tasksel/print-server
View file

@ -2,8 +2,8 @@ Task: print-server
Section: server
Description: Cups print server
This task sets up your system to be a print server.
Packages: list
Key:
cups
cups-bsd
cups-client
Packages: task-fields

2
helpers/DATA/tasksel/samba-server
View file

@ -3,6 +3,6 @@ Section: server
Description: Samba SMB file server
This task sets up your system to be a Samba file server, which is
especially suitable in networks with both Windows and GNU/Linux systems.
Packages: list
Key:
samba
Packages: task-fields

9
helpers/DATA/tasksel/trisquel-directory
View file

@ -1,9 +0,0 @@
Task: trisquel-directory
Section: user
Description: Trisquel directory server
This task provides a LDAP based directory server, which allows Trisquel
to serve user accounts and profiles, policies, applications, email and print management services.
Packages: list
Key:
trisquel-directory-server
trisquel-base

7
helpers/DATA/tasksel/trisquel-sugar
View file

@ -1,7 +0,0 @@
Task: trisquel-sugar
Section: user
Description: Trisquel On a Sugar TOAST
This task provides the Trisquel On a Sugar TOAST educational environment
Packages: list
Key:
trisquel-sugar

2
helpers/DATA/tasksel/web-server
View file

@ -2,7 +2,7 @@ Task: web-server
Section: server
Description: GLAMP web server
Selects a ready-made GNU+Linux/Apache/MySQL/PHP server.
Packages: list
Key:
apache2
mysql-server
Packages: list

4
helpers/make-apt-setup
View file

@ -41,7 +41,7 @@ START=$(getline apt-setup/contrib debian/apt-mirror-setup.templates)
END=$(getline "Please choose whether you want this software to be made available to you." debian/apt-mirror-setup.templates)
sed ${START},${END}d debian/apt-mirror-setup.templates -i
sed '/canonical/d;
/bin/sed '/canonical/d;
/Canonical/d;
s/main restricted universe multiverse/main/g;
s/dists restricted/dists/g;
@ -69,7 +69,7 @@ find archive.trisquel.info/ |egrep '(index.html|robots.txt)'|xargs rm
cd ..
rm generators/9[1-9]* generators/50mirror generators/50mirror.ubuntu
sed -i '/generators\/9[1-9]*/d' debian/*.install
sed -i '/generators\/9[1-9]*/d' debian/apt-setup-udeb.install
echo "generators/50mirror.trisquel usr/lib/apt-setup/generators
release-files/archive.trisquel.info usr/share/apt-setup/release-files" > debian/apt-mirror-setup.install

20
helpers/make-debian-installer
View file

@ -21,11 +21,9 @@ VERSION=1
NETINST=true
. ./config
apt-get install trisquel-keyring
cat << EOF > /etc/apt/sources.list
deb $DEVELMIRROR $UPSTREAM main
deb-src $DEVELMIRROR $UPSTREAM main
deb $DEVELMIRROR $CODENAME main
deb-src $DEVELMIRROR $CODENAME main
deb $LOCALMIRROR $CODENAME main
deb $LOCALMIRROR $CODENAME-updates main
deb-src $LOCALMIRROR $CODENAME main
@ -37,13 +35,17 @@ EOF
apt-get update
apt-get install trisquel-keyring
find build/pkg-lists -type f | xargs sed -i /media-retriever/d
LASTKERNEL=$(apt-cache showsrc linux-libc-dev|grep ^Version |head -n1|cut -d" " -f2|cut -d. -f1,2,3)
sed -i "s/3.0.\w*-\w*/$LASTKERNEL/g" ./build/config/i386/netboot/386.cfg ./build/config/i386.cfg ./build/config/amd64.cfg
/bin/sed -i "s/^BASEVERSION.*/BASEVERSION = $LASTKERNEL/g" ./build/config/i386.cfg ./build/config/amd64.cfg
sed -i "s/^MEDIUM_SUPPORTED.*/MEDIUM_SUPPORTED = cdrom netboot/g" ./build/config/i386.cfg ./build/config/amd64.cfg
sed 's/ubuntu-archive-keyring.gpg/trisquel-archive-keyring.gpg/' -i build/config/common
cp $DATA/splash.png build/boot/x86/pics/trisquel.png
sed -i 's:archive.gpg:archive.gpg\n\tcp -a $(TREE)/usr/share/keyrings/trisquel-archive-keyring.gpg $(TREE)/usr/share/keyrings/ubuntu-archive-keyring.gpg:' build/Makefile
sed -i 's/ubuntu.png/trisquel.png/g' build/config/x86.cfg
cat << EOF > build/sources.list.udeb.local
@ -52,6 +54,8 @@ deb $LOCALMIRROR $CODENAME-updates main/debian-installer
#deb $LOCALMIRROR $CODENAME-security main/debian-installer
EOF
rpl 2004-2012 2004-2013 . -R
rpl 2004-2011 2004-2013 . -R
rpl 2004-2010 2004-2011 . -R
rpl 2004-2009 2004-2011 . -R
rpl 2004-2008 2004-2011 . -R
@ -75,7 +79,9 @@ rpl ubuntu-archive-keyring trisquel-archive-keyring . -R
#sed -i "s:^To install.*:This is the Trisquel GNU/Linux $TVERSION LTS \"$TCODENAME\" network install CD.:g" build/boot/x86/boot.txt
#sed -i 's:^For the.*:For the default installation, press ENTER, for more help press F1.:g' build/boot/x86/boot.txt
sed s/tasks=standard/tasks=trisquel-console/ build/boot/x86/syslinux.cfg -i
#sed s/tasks=standard/tasks=trisquel-console/ build/boot/x86/syslinux.cfg -i
changelog "Rebranded and adapted for Trisquel"
compile
cp build/tmp/netboot/mini.iso build/tmp/netboot/initrd.gz /root/

2
helpers/make-tasksel
View file

@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION=1
VERSION=2
COMPONENT=main
. ./config