--- Begin Message ---
|
Subject: |
ltib ltib config/userspace/packages.lkc config/... |
|
Date: |
Sun, 04 Mar 2012 17:41:55 +0000 |
CVSROOT: /sources/ltib
Module name: ltib
Changes by: Stuart Hughes <seh> 12/03/04 17:41:55
Modified files:
. : ltib
config/userspace: packages.lkc pkg_map sysconfig.lkc
dist/lfs-5.1/dbus: dbus.spec
dist/lfs-5.1/nss-mdns: nss-mdns.spec
dist/lfs-5.1/skell: skell.spec
dist/lfs-5.1/sysconfig: sysconfig.spec
Added files:
dist/lfs-5.1/avahi: avahi.spec
Log message:
Add avahi and update nss-mds, skell, dbus. Submitted by Fritz Mueller
on 20120212
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ltib/ltib?cvsroot=ltib&r1=1.79&r2=1.80
http://cvs.savannah.gnu.org/viewcvs/ltib/config/userspace/packages.lkc?cvsroot=ltib&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/ltib/config/userspace/pkg_map?cvsroot=ltib&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/ltib/config/userspace/sysconfig.lkc?cvsroot=ltib&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/ltib/dist/lfs-5.1/avahi/avahi.spec?cvsroot=ltib&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/ltib/dist/lfs-5.1/dbus/dbus.spec?cvsroot=ltib&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/ltib/dist/lfs-5.1/nss-mdns/nss-mdns.spec?cvsroot=ltib&r1=1.1.1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/ltib/dist/lfs-5.1/skell/skell.spec?cvsroot=ltib&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/ltib/dist/lfs-5.1/sysconfig/sysconfig.spec?cvsroot=ltib&r1=1.7&r2=1.8
Patches:
Index: ltib
===================================================================
RCS file: /sources/ltib/ltib/ltib,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- ltib 18 Feb 2012 11:40:21 -0000 1.79
+++ ltib 4 Mar 2012 17:41:53 -0000 1.80
@@ -115,7 +115,7 @@
TOOLCHAIN_CFLAGS DISTRO PKG_UCLIBC PKG_GLIBC
LIBC_HACKING",
app_version => "11.4.1",
- cvs_version => '$Revision: 1.79 $',
+ cvs_version => '$Revision: 1.80 $',
config_dir => "$top/config",
platforms_dir => "$top/config/platform",
plat_dir => "",
@@ -262,7 +262,8 @@
PKG_BASH => [ qw/PKG_BASH_WANT_NO_SH_SYMLINK/ ],
PKG_DHCP => [ qw/PKG_DHCP_WANT_SERVER PKG_DHCP_WANT_CLIENT/ ],
PKG_PPP => [ qw/PKG_PPP_WANT_FILTER/ ],
- PKG_SKELL => [ qw/PKG_SKELL_WANT_TERMINFO/ ],
+ PKG_SKELL => [ qw/PKG_SKELL_WANT_TERMINFO PKG_NSS_MDNS/ ],
+ PKG_DBUS => [ qw/PKG_AVAHI/ ],
PKG_CAIRO => [ qw/PKG_XORG_SERVER/ ],
PKG_BOOST => [ qw/PKG_BOOST_WANT_HEADER_ONLY/ ],
PKG_BZIP2 => [ qw/PKG_BZIP2_WANT_SHARED/ ]
@@ -1571,6 +1572,7 @@
$ENV{LTIB_BATCH} = $cf->{batch} || "";
$ENV{PKG_BUSYBOX} = $pcf->{PKG_BUSYBOX} || "";
$ENV{PKG_SYSVINIT} = $pcf->{PKG_SYSVINIT} || "";
+ $ENV{PKG_NSS_MDNS} = $pcf->{PKG_NSS_MDNS} || "";
$ENV{INITTAB_LINE} = $pcf->{INITTAB_LINE} || "";
$ENV{SOFT_FP_ARCH} = $pcf->{SOFT_FP_ARCH} || "";
$ENV{GLIBC_WANT_KERNEL_HEADERS} = $pcf->{GLIBC_WANT_KERNEL_HEADERS} || "";
Index: config/userspace/packages.lkc
===================================================================
RCS file: /sources/ltib/ltib/config/userspace/packages.lkc,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- config/userspace/packages.lkc 18 Feb 2012 17:39:21 -0000 1.47
+++ config/userspace/packages.lkc 4 Mar 2012 17:41:54 -0000 1.48
@@ -5,6 +5,24 @@
-source packages.lkc
comment 'Common package selection list'
+config PKG_ALSA_LIB
+ bool "alsa-lib"
+ help
+ The Advanced Linux Sound Architecture (ALSA) provides audio and MIDI
+ functionality to the Linux operating system. The alsa-lib user-space
+ library simplifies application programming and provides a higher level
+ of audio functionality compared to OSS.
+
+config PKG_ALSA_UTILS
+ select PKG_ALSA_LIB
+ select PKG_NCURSES
+ bool "alsa-utils"
+ help
+ This package contains the command line utilities for the ALSA project.
+ The package can be compiled only with the installed ALSA driver and
+ the ALSA C library. Utilities include: alsaconf, alsactl,
aplay/arecord,
+ amixer, alsamixer, amidi, and iecset.
+
config PKG_APPTRK
depends LINTARCH != arm
bool "Apptrk"
@@ -86,23 +104,19 @@
This fails on debian as autoconf is not on the host
-config PKG_ALSA_LIB
- bool "alsa-lib"
- help
- The Advanced Linux Sound Architecture (ALSA) provides audio and MIDI
- functionality to the Linux operating system. The alsa-lib user-space
- library simplifies application programming and provides a higher level
- of audio functionality compared to OSS.
-
-config PKG_ALSA_UTILS
- select PKG_ALSA_LIB
- select PKG_NCURSES
- bool "alsa-utils"
+config PKG_AVAHI
+ select PKG_DBUS
+ select PKG_EXPAT
+ select PKG_LIBDAEMON
+ bool "Avahi"
help
- This package contains the command line utilities for the ALSA project.
- The package can be compiled only with the installed ALSA driver and
- the ALSA C library. Utilities include: alsaconf, alsactl,
aplay/arecord,
- amixer, alsamixer, amidi, and iecset.
+ Avahi is a system which facilitates service discovery on a local
+ network via the mDNS/DNS-SD protocol suite. This enables you to plug
+ your laptop or computer into a network and instantly be able to view
+ other people who you can chat with, find printers to print to or find
+ files being shared. Compatible technology is found in Apple MacOS X
+ (branded Bonjour and sometimes Zeroconf).
+ Note: this package requires the host package: intltool
config PKG_BASH
depends CAP_HAS_MMU
@@ -1970,13 +1984,15 @@
config PKG_NSS_MDNS
depends CAP_HAS_MMU
+ select PKG_AVAHI
bool "nss-mdns"
help
nss-mdns is a plugin for the GNU Name Service Switch (NSS)
functionality of the GNU C Library (glibc) providing host name
resolution via Multicast DNS (aka Zeroconf, aka Apple Rendezvous,
- aka Apple Bonjour), effectively allowing name resolution by common
- Unix/Linux programs in the ad-hoc mDNS domain .local.
+ aka Apple Bonjour, aka Avahi), effectively allowing name resolution
+ by common Unix/Linux programs in the ad-hoc mDNS domain .local.
+ Depends on kernel IP multicasting support, which must be enabled.
config PKG_NTPCLIENT
bool "ntpclient"
Index: config/userspace/pkg_map
===================================================================
RCS file: /sources/ltib/ltib/config/userspace/pkg_map,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- config/userspace/pkg_map 18 Feb 2012 17:39:21 -0000 1.31
+++ config/userspace/pkg_map 4 Mar 2012 17:41:54 -0000 1.32
@@ -29,7 +29,6 @@
PKG_SASH = sash
PKG_COREUTILS = coreutils
PKG_SEQ = seq
-PKG_DBUS = dbus
PKG_ZLIB = zlib
PKG_LFS_UTILS = lfs-utils
PKG_FINDUTILS = findutils
@@ -112,6 +111,9 @@
PKG_WHICH = which
PKG_FAKEROOT = fakeroot
PKG_EXPAT = expat
+PKG_LIBDAEMON = libdaemon
+PKG_DBUS = dbus
+PKG_AVAHI = avahi
PKG_GDB = gdb
PKG_GDB_BDM = m68k-gdb-bdm
PKG_STRACE = strace
@@ -301,7 +303,6 @@
PKG_LIBOGG = libogg
PKG_LIBVORBIS = libvorbis
PKG_LIBTHEORA = libtheora
-PKG_LIBDAEMON = libdaemon
PKG_LIBXML_PLUS_PLUS = libxml++
PKG_JSON_C = json-c
PKG_DBG = dbg
Index: config/userspace/sysconfig.lkc
===================================================================
RCS file: /sources/ltib/ltib/config/userspace/sysconfig.lkc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- config/userspace/sysconfig.lkc 12 Dec 2008 17:11:31 -0000 1.2
+++ config/userspace/sysconfig.lkc 4 Mar 2012 17:41:54 -0000 1.3
@@ -214,4 +214,21 @@
The config file pango.modules must be created on the target.
endif
+config SYSCFG_START_DBUS
+ depends PKG_DBUS
+ bool "start D-Bus system bus daemon"
+ default y
+ help
+ Starts the global D-Bus system bus instance. This is used by Avahi
+ for communication between Avahi clients and the Avahi daemon, among
+ other things.
+
+config SYSCFG_START_AVAHI
+ depends PKG_AVAHI
+ bool "start Avahi daemon"
+ select SYSCFG_START_DBUS
+ default y
+ help
+ Starts the Avahi mDNS daemon.
+
endmenu
Index: dist/lfs-5.1/dbus/dbus.spec
===================================================================
RCS file: /sources/ltib/ltib/dist/lfs-5.1/dbus/dbus.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- dist/lfs-5.1/dbus/dbus.spec 18 Feb 2012 17:45:15 -0000 1.2
+++ dist/lfs-5.1/dbus/dbus.spec 4 Mar 2012 17:41:54 -0000 1.3
@@ -2,8 +2,8 @@
Summary : Message bus system for applications to talk to one another
Name : dbus
-Version : 1.2.6
-Release : 1
+Version : 1.4.16
+Release : 2
License : AFLv2.1 or GPLv2
Vendor : Free Desktop
Packager : Thierry Pierret/Stuart Hughes/Tarek Allaoua
@@ -22,7 +22,7 @@
%Build
# Note --with-xml could also specify libxml
config_opts='ac_cv_have_abstract_sockets=yes'
-extra_opts='--with-xml=expat --without-x --enable-tests=no --enable-selinux=no'
+extra_opts='--with-xml=expat --without-x --enable-tests=no --enable-selinux=no
--localstatedir=/var --disable-xml-docs --disable-doxygen-docs'
eval $config_opts \
./configure --prefix=%{_prefix} --host=$CFGHOST --build=%{_build} \
Index: dist/lfs-5.1/nss-mdns/nss-mdns.spec
===================================================================
RCS file: /sources/ltib/ltib/dist/lfs-5.1/nss-mdns/nss-mdns.spec,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -b -r1.1.1.1 -r1.2
--- dist/lfs-5.1/nss-mdns/nss-mdns.spec 6 Nov 2007 15:44:42 -0000 1.1.1.1
+++ dist/lfs-5.1/nss-mdns/nss-mdns.spec 4 Mar 2012 17:41:54 -0000 1.2
@@ -2,8 +2,8 @@
Summary : plugin for the GNU Name Service Switch providing host name
resolution via Multicast DNS
Name : nss-mdns
-Version : 0.8
-Release : 1
+Version : 0.10
+Release : 2
License : LGPL
Vendor : Freescale
Packager : Alan Tull
@@ -27,6 +27,7 @@
rm -rf $RPM_BUILD_ROOT
#make install DESTDIR=$RPM_BUILD_ROOT/%{pfx}
make install prefix=$RPM_BUILD_ROOT/%{pfx}/%{_prefix}
+find $RPM_BUILD_ROOT/%{pfx}/%{_prefix}/lib/ -name "*.la" | xargs rm -f
%Clean
rm -rf $RPM_BUILD_ROOT
@@ -34,5 +35,3 @@
%Files
%defattr(-,root,root)
%{pfx}/*
-
-
Index: dist/lfs-5.1/skell/skell.spec
===================================================================
RCS file: /sources/ltib/ltib/dist/lfs-5.1/skell/skell.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- dist/lfs-5.1/skell/skell.spec 20 Nov 2009 19:12:16 -0000 1.4
+++ dist/lfs-5.1/skell/skell.spec 4 Mar 2012 17:41:54 -0000 1.5
@@ -3,13 +3,14 @@
Summary : Skelleton files for an embedded root filesystem
Name : skell
Version : 1.19
-Release : 1
+Release : 2
License : GPL
Vendor : Freescale
Packager : Steve Papacharalambous/Stuart Hughes
Group : System Environment/Utilities
Source : %{name}-%{version}.tar.gz
Patch1 : skell-1.19-ipautoconf.patch
+Patch2 : skell-1.19-avahi-dbus.patch
BuildRoot : %{_tmppath}/%{name}
Prefix : %{pfx}
@@ -19,6 +20,7 @@
%Prep
%setup
%patch1 -p1
+%patch2 -p1
%Build
@@ -29,6 +31,10 @@
then
rm -rf $RPM_BUILD_ROOT/%{pfx}/usr/share/terminfo
fi
+if [ "$PKG_NSS_MDNS" = "y" ]
+then
+ sed -i 's/hosts:.*/hosts: files mdns4_minimal [NOTFOUND=return] dns
mdns4/' $RPM_BUILD_ROOT/%{pfx}/etc/nsswitch.conf
+fi
%Clean
rm -rf $RPM_BUILD_ROOT
Index: dist/lfs-5.1/sysconfig/sysconfig.spec
===================================================================
RCS file: /sources/ltib/ltib/dist/lfs-5.1/sysconfig/sysconfig.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- dist/lfs-5.1/sysconfig/sysconfig.spec 18 Mar 2009 18:20:35 -0000
1.7
+++ dist/lfs-5.1/sysconfig/sysconfig.spec 4 Mar 2012 17:41:54 -0000
1.8
@@ -91,14 +91,22 @@
then
pango=pango
fi
+if [ "$SYSCFG_START_DBUS" = "y" ]
+then
+ dbus=dbus
+fi
+if [ "$SYSCFG_START_AVAHI" = "y" ]
+then
+ avahi=avahi
+fi
cat <<EOF > $RPM_BUILD_ROOT/%{pfx}/etc/rc.d/rc.conf
-all_services="mount-proc-sys mdev udev hostname devfsd depmod modules
filesystems syslog network inetd portmap dropbear sshd boa smb dhcpd settime
qtopia watchdog gtk2 pango"
-all_services_r="pango gtk2 watchdog qtopia settime dhcpd smb boa sshd dropbear
portmap inetd network syslog filesystems modules depmod devfsd hostname udev
mdev mount-proc-sys"
+all_services="mount-proc-sys mdev udev hostname devfsd depmod modules
filesystems syslog network inetd portmap dropbear sshd boa smb dhcpd settime
qtopia watchdog gtk2 pango dbus avahi"
+all_services_r="avahi dbus pango gtk2 watchdog qtopia settime dhcpd smb boa
sshd dropbear portmap inetd network syslog filesystems modules depmod devfsd
hostname udev mdev mount-proc-sys"
-cfg_services="mount-proc-sys $mdev $udev hostname $devfsd depmod modules
filesystems $syslog $network $inetd $portmap $dropbear $sshd $boa $smb $dhcpd
$settime $qtopia $watchdog $gtk2 $pango"
+cfg_services="mount-proc-sys $mdev $udev hostname $devfsd depmod modules
filesystems $syslog $network $inetd $portmap $dropbear $sshd $boa $smb $dhcpd
$settime $qtopia $watchdog $gtk2 $pango $dbus $avahi"
-cfg_services_r="$pango $gtk2 $watchdog $qtopia $settime $dhcpd $smb $boa $sshd
$dropbear $portmap $inetd $network $syslog filesystems modules depmod $devfsd
hostname $udev $mdev mount-proc-sys"
+cfg_services_r="$avahi $dbus $pango $gtk2 $watchdog $qtopia $settime $dhcpd
$smb $boa $sshd $dropbear $portmap $inetd $network $syslog filesystems modules
depmod $devfsd hostname $udev $mdev mount-proc-sys"
export HOSTNAME="${SYSCFG_HOSTNAME:-$PLATFORM}"
export NTP_SERVER="$SYSCFG_NTP_SERVER"
Index: dist/lfs-5.1/avahi/avahi.spec
===================================================================
RCS file: dist/lfs-5.1/avahi/avahi.spec
diff -N dist/lfs-5.1/avahi/avahi.spec
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ dist/lfs-5.1/avahi/avahi.spec 4 Mar 2012 17:41:54 -0000 1.1
@@ -0,0 +1,36 @@
+%define pfx /opt/freescale/rootfs/%{_target_cpu}
+
+Summary : Avahi mDNS/DNS-SD service discovery suite
+Name : avahi
+Version : 0.6.30
+Release : 1
+License : LGPL
+Vendor : Avid Technology
+Packager : Fritz Mueller
+Group : xxxx
+URL : http://avahi.org
+Source : %{name}-%{version}.tar.gz
+BuildRoot : %{_tmppath}/%{name}
+Prefix : %{pfx}
+
+%Description
+%{summary}
+
+%Prep
+%setup
+
+%Build
+./configure --prefix=%{_prefix} --host=$CFGHOST --build=%{_build}
--with-distro=debian --disable-nls --disable-glib --disable-gobject
--disable-qt3 --disable-qt4 --disable-gtk --disable-gtk3 --disable-gdbm
--disable-mono --disable-monodoc --disable-autoipd --disable-python
--disable-doxygen-doc --disable-manpages --enable-compat-libdns_sd
+make
+
+%Install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT/%{pfx}
+find $RPM_BUILD_ROOT/%{pfx}/%{_prefix}/lib/ -name "*.la" | xargs rm -f
+
+%Clean
+rm -rf $RPM_BUILD_ROOT
+
+%Files
+%defattr(-,root,root)
+%{pfx}/*
--- End Message ---