On Tuesday 15 April 2008, David McCullough wrote: > Jivin Mike Frysinger lays it down ... > > > The samba makefile does: > > CONFOPTS = ... --with-privatedir=/etc/config --with-configdir=/etc/config > > ... Which means smb.conf should be installed into /etc/config. > > Unfortunately, /etc/config is essentially a flatfsd thing, and > /etc/config is created on first boot from /etc/default. So the makefile > is basically correct, although it has several problems: > > 1) It should only do the --with-privatedir=/etc/config ... > if CONFIG_USER_FLATFSD_FLATFSD is set. > 2) It should install to the correct location based on > CONFIG_USER_FLATFSD_FLATFSD > > Here's a patch I'll commit to fix it up, > > Cheers, > Davidm > > > Index: user/samba/Makefile > =================================================================== > RCS file: user/samba/Makefile,v > retrieving revision 1.8 > diff -u -r1.8 Makefile > --- user/samba/Makefile 29 Jul 2005 03:36:45 -0000 1.8 > +++ user/samba/Makefile 15 Apr 2008 21:49:52 -0000 > @@ -4,8 +4,8 @@ > $(MAKE) -C source clean > romfs: > $(MAKE) -C source romfs > - if [ -d "$(ROMFSDIR)/etc/default/" ]; then \ > - echo "[global]" > $(ROMFSDIR)/etc/default/smb.conf ; \ > - else \ > - echo "[global]" > $(ROMFSDIR)/etc/smb.conf ; \ > - fi > +ifdef CONFIG_USER_FLATFSD_FLATFSD > + echo "[global]" > $(ROMFSDIR)/etc/default/smb.conf > +else > + echo "[global]" > $(ROMFSDIR)/etc/smb.conf > +endif > Index: user/samba/source/makefile > =================================================================== > RCS file: user/samba/source/makefile,v > retrieving revision 1.15 > diff -u -r1.15 makefile > --- user/samba/source/makefile 11 Apr 2008 03:15:16 -0000 1.15 > +++ user/samba/source/makefile 15 Apr 2008 21:49:52 -0000 > @@ -1,15 +1,19 @@ > + > ifdef CONFIG_USER_SAMBA_SHARED > SHARED := enable > else > SHARED := disable > endif > > -CONFOPTS = --prefix= --with-smbmount --with-privatedir=/etc/config \ > - --with-configdir=/etc/config > --with-logfilebase=/var/log \ > +CONFOPTS = --prefix= --with-smbmount --with-logfilebase=/var/log \ > --without-ldap --disable-cups --disable-pie \ > --$(SHARED)-shared --disable-debug --disable-developer \ > --disable-krb5developer --disable-dmalloc --disable-nls > > +ifdef CONFIG_USER_FLATFSD_FLATFSD > +CONFOPTS += --with-privatedir=/etc/config --with-configdir=/etc/config > +endif
while killing off flatfsd-specific things is good, this change makes the situation for everyone else worse. the default config path is libdir, not /etc, so the patch should read: +ifdef CONFIG_USER_FLATFSD_FLATFSD +CONFOPTS += --with-privatedir=/etc/config --with-configdir=/etc/config +else +CONFOPTS += --with-privatedir=/etc --with-configdir=/etc +endif -mike
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ uClinux-dev mailing list uClinux-dev@uclinux.org http://mailman.uclinux.org/mailman/listinfo/uclinux-dev This message was resent by uclinux-dev@uclinux.org To unsubscribe see: http://mailman.uclinux.org/mailman/options/uclinux-dev
