From 7f64f288bbe4671d281edb8dee45dd0ff8c02120 Mon Sep 17 00:00:00 2001 From: geos_one Date: Fri, 29 Oct 2010 08:50:25 +0000 Subject: [PATCH] correct go-genlink.sh profile script git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/genlink@2616 6952d904-891a-0410-993b-d76249ca496b --- .../ls_pro_live/armv5tejl-stage4.spec | 2 +- .../root_overlay/etc/profile.d/go-genlink.sh | 8 +++--- Documentation/ls_xhl/armv5tejl-stage4.spec | 28 +++++++++---------- .../root_overlay/etc/profile.d/go-genlink.sh | 8 +++--- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Documentation/ls_pro_live/armv5tejl-stage4.spec b/Documentation/ls_pro_live/armv5tejl-stage4.spec index dd1b016..88451e6 100644 --- a/Documentation/ls_pro_live/armv5tejl-stage4.spec +++ b/Documentation/ls_pro_live/armv5tejl-stage4.spec @@ -92,7 +92,7 @@ stage4/use: # then it will be defined elsewhere. # example: # stage4/packages: livecd-tools dhcpcd acpid apmd gentoo-sources coldplug fxload irssi gpm syslog-ng parted links raidtools dosfstools nfs-utils jfsutils xfsprogs e2fsprogs reiserfsprogs ntfsprogs pwgen rp-pppoe screen mirrorselect penggy iputils hwdata-knoppix hwsetup lvm2 evms vim pptpclient mdadm ethtool wireless-tools prism54-firmware wpa_supplicant -stage4/packages: openssh dhcpcd micro_evtd linux-buffalo_ls_pro_live gpm syslog-ng gdisk parted links dosfstools nfs-utils jfsutils xfsprogs e2fsprogs reiserfsprogs reiser4progs pwgen screen mirrorselect iputils lvm2 vim mdadm ethtool ntp smartmontools hddtemp +stage4/packages: layman openssh dhcpcd micro_evtd linux-buffalo_ls_pro_live buffalo_ls_pro_live-sources gpm syslog-ng gdisk parted atop links dosfstools nfs-utils jfsutils xfsprogs e2fsprogs reiserfsprogs reiser4progs pwgen screen mirrorselect iputils lvm2 vim mdadm ethtool ntp smartmontools hddtemp # A fsscript is simply a shell script that is copied into the chroot of the stage4 # after the kernel(s) and any external modules have been compiled and is diff --git a/Documentation/ls_pro_live/root_overlay/etc/profile.d/go-genlink.sh b/Documentation/ls_pro_live/root_overlay/etc/profile.d/go-genlink.sh index c75e348..dfd965a 100644 --- a/Documentation/ls_pro_live/root_overlay/etc/profile.d/go-genlink.sh +++ b/Documentation/ls_pro_live/root_overlay/etc/profile.d/go-genlink.sh @@ -1,6 +1,6 @@ -echo uncompressing /var/lib/layman/go-genlink.tar.bz2 to /var/lib/layman/ +echo "uncompressing /var/lib/layman/go-genlink.tar.bz2 to /var/lib/layman/" tar -xvjf /var/lib/layman/go-genlink.tar.bz2 -C /var/lib/layman/ -echo removing /var/lib/layman/go-genlink.tar.bz2 +echo "removing /var/lib/layman/go-genlink.tar.bz2" rm -f /var/lib/layman/go-genlink.tar.bz2 -echo removing $0 -rm -f $0 \ No newline at end of file +echo "removing /etc/profile.d/go-genlink.sh" +rm -f /etc/profile.d/go-genlink.sh \ No newline at end of file diff --git a/Documentation/ls_xhl/armv5tejl-stage4.spec b/Documentation/ls_xhl/armv5tejl-stage4.spec index e701042..f744d4a 100644 --- a/Documentation/ls_xhl/armv5tejl-stage4.spec +++ b/Documentation/ls_xhl/armv5tejl-stage4.spec @@ -6,41 +6,41 @@ # http://www.gentoo.org/proj/en/releng/catalyst/ # example: # subarch: athlon-xp -subarch: +subarch: arm # The version stamp is an identifier for the build. It can be anything you wish# it to be, but it is usually a date. # example: # version_stamp: 2006.1 -version_stamp: +version_stamp: armv5tejl-buffalo_ls_xhl.0 # The target specifies what target we want catalyst to do. For building a CD, # we start with stage4 as our target. # example: # target: stage4 -target: +target: stage4 # The rel_type defines what kind of build we are doing. This is merely another # identifier, but it useful for allowing multiple concurrent builds. Usually, # default will suffice. # example: # rel_type: default -rel_type: +rel_type: default # This is the system profile to be used by catalyst to build this target. It is# specified as a relative path from /usr/portage/profiles. # example: # profile: default-linux/x86/2006.1 -profile: +profile: default-linux/arm/10.0/server # This specifies which snapshot to use for building this target. # example: # snapshot: 2006.1 -snapshot: +snapshot: armv5tejl.0 # This specifies where the seed stage comes from for this target, The path is # relative to $clst_sharedir/builds. The rel_type is also used as a path prefix# for the seed. # example: # default/stage3-x86-2006.1 -source_subpath: +source_subpath: default/stage3-arm-armv5tejl.0 # These are the hosts used as distcc slaves when distcc is enabled in your # catalyst.conf. It follows the same syntax as distcc-config --set-hosts and @@ -54,13 +54,13 @@ distcc_hosts: # targets to minimize problems. # example: # portage_confdir: /etc/portage -portage_confdir: +portage_confdir: /home/mario/mars/linamh/trunk/genlink/Documentation/ls_xhl/portage/ # This option specifies the location to a portage overlay that you would like to # have used when building this target. # example: # portage_overlay: /usr/local/portage -portage_overlay: +portage_overlay: /home/mario/mars/linamh/trunk/genlink # This allows the optional directory containing the output packages for # catalyst. Mainly used as a way for different spec files to access the same @@ -92,7 +92,7 @@ stage4/use: # then it will be defined elsewhere. # example: # stage4/packages: livecd-tools dhcpcd acpid apmd gentoo-sources coldplug fxload irssi gpm syslog-ng parted links raidtools dosfstools nfs-utils jfsutils xfsprogs e2fsprogs reiserfsprogs ntfsprogs pwgen rp-pppoe screen mirrorselect penggy iputils hwdata-knoppix hwsetup lvm2 evms vim pptpclient mdadm ethtool wireless-tools prism54-firmware wpa_supplicant -stage4/packages: +stage4/packages: openssh dhcpcd micro_evtd linux-buffalo_ls_xhl sim_buffalo gpm syslog-ng gdisk parted links dosfstools nfs-utils jfsutils xfsprogs e2fsprogs reiserfsprogs reiser4progs pwgen screen mirrorselect iputils lvm2 vim mdadm ethtool ntp smartmontools hddtemp # A fsscript is simply a shell script that is copied into the chroot of the stage4 # after the kernel(s) and any external modules have been compiled and is @@ -104,7 +104,7 @@ stage4/packages: # into the chroot by catalyst automatically. # example: # stage4/fsscript: -stage4/fsscript: +stage4/fsscript: /home/mario/mars/linamh/trunk/genlink/Documentation/ls_xhl/fsscript # This is where you set the splash theme. This theme must be present in # /etc/splash, before the kernel has completed building. @@ -149,7 +149,7 @@ stage4/modblacklist: # correctly for us. Since we do not use this, it is left blank below. # example: # stage4/rcadd: -stage4/rcadd: +stage4/rcadd: micro_evtd|boot hwclock|boot syslog-ng|boot sysfs|boot net.eth0|boot dbus|default linux-logo|default ntpd|default ntp-client|default smartd|default hddtemp|default sshd|default # This is for removing init script from runlevels. It is executed after the # defaults shipped with catalyst, so it is possible to remove the defaults using @@ -167,7 +167,7 @@ stage4/rcdel: # it blank below. # example: # stage4/root_overlay: -stage4/root_overlay: +stage4/root_overlay: /home/mario/mars/linamh/trunk/genlink/Documentation/ls_xhl/root_overlay # This is used by catalyst to copy the specified file to /etc/X11/xinit/xinitrc # and is used by the stage4/type gentoo-gamecd and generic-livecd. While the @@ -255,4 +255,4 @@ stage4/empty: # very usefu in cleaning up stray files in /etc left over after stage4/unmerge. # example: # stage4/rm: /lib/*.a /usr/lib/*.a /usr/lib/gcc-lib/*/*/libgcj* /etc/dispatch-conf.conf /etc/etc-update.conf /etc/*- /etc/issue* /etc/make.conf /etc/man.conf /etc/*.old /root/.viminfo /usr/sbin/fb* /usr/sbin/fsck.cramfs /usr/sbin/fsck.minix /usr/sbin/mkfs.minix /usr/sbin/mkfs.bfs /usr/sbin/mkfs.cramfs /lib/security/pam_access.so /lib/security/pam_chroot.so /lib/security/pam_debug.so /lib/security/pam_ftp.so /lib/security/pam_issue.so /lib/security/pam_mail.so /lib/security/pam_motd.so /lib/security/pam_mkhomedir.so /lib/security/pam_postgresok.so /lib/security/pam_rhosts_auth.so /lib/security/pam_userdb.so /usr/share/consolefonts/1* /usr/share/consolefonts/7* /usr/share/consolefonts/8* /usr/share/consolefonts/9* /usr/share/consolefonts/A* /usr/share/consolefonts/C* /usr/share/consolefonts/E* /usr/share/consolefonts/G* /usr/share/consolefonts/L* /usr/share/consolefonts/M* /usr/share/consolefonts/R* /usr/share/consolefonts/a* /usr/share/consolefonts/c* /usr/share/consolefonts/dr* /usr/share/consolefonts/g* /usr/share/consolefonts/i* /usr/share/consolefonts/k* /usr/share/consolefonts/l* /usr/share/consolefonts/r* /usr/share/consolefonts/s* /usr/share/consolefonts/t* /usr/share/consolefonts/v* /etc/splash/livecd-2006.1/16* /etc/splash/livecd-2006.1/12* /etc/splash/livecd-2006.1/6* /etc/splash/livecd-2006.1/8* /etc/splash/livecd-2006.1/images/silent-16* /etc/splash/livecd-2006.1/images/silent-12* /etc/splash/livecd-2006.1/images/silent-6* /etc/splash/livecd-2006.1/images/silent-8* /etc/splash/livecd-2006.1/images/verbose-16* /etc/splash/livecd-2006.1/images/verbose-12* /etc/splash/livecd-2006.1/images/verbose-6* /etc/splash/livecd-2006.1/images/verbose-8* /etc/make.conf.example /etc/make.globals /etc/resolv.conf -stage4/rm: +stage4/rm: /usr/bin/qemu-arm diff --git a/Documentation/ls_xhl/root_overlay/etc/profile.d/go-genlink.sh b/Documentation/ls_xhl/root_overlay/etc/profile.d/go-genlink.sh index c75e348..dfd965a 100644 --- a/Documentation/ls_xhl/root_overlay/etc/profile.d/go-genlink.sh +++ b/Documentation/ls_xhl/root_overlay/etc/profile.d/go-genlink.sh @@ -1,6 +1,6 @@ -echo uncompressing /var/lib/layman/go-genlink.tar.bz2 to /var/lib/layman/ +echo "uncompressing /var/lib/layman/go-genlink.tar.bz2 to /var/lib/layman/" tar -xvjf /var/lib/layman/go-genlink.tar.bz2 -C /var/lib/layman/ -echo removing /var/lib/layman/go-genlink.tar.bz2 +echo "removing /var/lib/layman/go-genlink.tar.bz2" rm -f /var/lib/layman/go-genlink.tar.bz2 -echo removing $0 -rm -f $0 \ No newline at end of file +echo "removing /etc/profile.d/go-genlink.sh" +rm -f /etc/profile.d/go-genlink.sh \ No newline at end of file