diff options
| -rw-r--r-- | conf/distro/openslug-native-packages.conf | 7 | ||||
| -rw-r--r-- | conf/distro/openslug-native.conf | 6 | ||||
| -rw-r--r-- | packages/dropbear/dropbear_0.46.bb | 17 | ||||
| -rwxr-xr-x | packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map | 138 | ||||
| -rw-r--r-- | packages/initscripts/initscripts_1.0.bb | 2 | ||||
| -rw-r--r-- | packages/linux/linux-openzaurus_2.6.13-rc3-mm3.bb | 7 | ||||
| -rw-r--r-- | packages/meta/openslug-native-packages.bb | 16 | ||||
| -rw-r--r-- | packages/meta/openslug-packages.bb | 60 | ||||
| -rw-r--r-- | packages/meta/ucslugc-packages.bb | 131 | ||||
| -rw-r--r-- | packages/openssh/openssh_4.0p1.bb | 18 | ||||
| -rw-r--r-- | packages/procps/procps-3.2.5/install.patch | 52 | ||||
| -rw-r--r-- | packages/procps/procps_3.2.5.bb | 2 | ||||
| -rw-r--r-- | packages/samba/samba_3.0.14a.bb | 4 |
13 files changed, 308 insertions, 152 deletions
diff --git a/conf/distro/openslug-native-packages.conf b/conf/distro/openslug-native-packages.conf new file mode 100644 index 0000000000..d4fedda6e2 --- /dev/null +++ b/conf/distro/openslug-native-packages.conf @@ -0,0 +1,7 @@ +# automatically generated by bitbake freeze +BBFILES := "\ +${PKGDIR}/packages/vlan/*.bb \ +${PKGDIR}/packages/gzip/*.bb \ +${PKGDIR}/packages/meta/*.bb \ +${OPENSLUG_EXTRA_BBFILES}" +# I don't know of any packages we currently need to compile nativly, so this is something to test with diff --git a/conf/distro/openslug-native.conf b/conf/distro/openslug-native.conf index f946afe216..a366aa7688 100644 --- a/conf/distro/openslug-native.conf +++ b/conf/distro/openslug-native.conf @@ -9,9 +9,3 @@ ASSUME_PROVIDED = "libtool-cross libtool-native automake-native autoconf-native # Our build host is armeb, not armv5eb that the kernel reports BUILD_ARCH = armeb -# I don't know of any packages we currently need to compile nativly, so here are two examples -BBFILES = "\ -${PKGDIR}/packages/vlan/*.bb \ -${PKGDIR}/packages/gzip/*.bb \ -${OPENSLUG_EXTRA_BBFILES}" - diff --git a/packages/dropbear/dropbear_0.46.bb b/packages/dropbear/dropbear_0.46.bb index 3a2b54072f..739950ed1a 100644 --- a/packages/dropbear/dropbear_0.46.bb +++ b/packages/dropbear/dropbear_0.46.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://matt.ucc.asn.au/dropbear/dropbear.html" SECTION = "console/network" LICENSE = "MIT" DEPENDS = "zlib" -PR = "r1" +PR = "r2" PROVIDES = "ssh sshd" SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \ @@ -41,10 +41,12 @@ do_install() { ${D}${localstatedir} install -m 0755 dropbearmulti ${D}${sbindir}/ - for i in ${BINCOMMANDS} - do - ln -s ${sbindir}/dropbearmulti ${D}${bindir}/$i - done +# for i in ${BINCOMMANDS} +# do +# ln -s ${sbindir}/dropbearmulti ${D}${bindir}/$i +# done + ln -s ${sbindir}/dropbearmulti ${D}${bindir}/dbclient + for i in ${SBINCOMMANDS} do ln -s ./dropbearmulti ${D}${sbindir}/$i @@ -57,6 +59,11 @@ do_install() { chmod 755 ${D}${sysconfdir}/init.d/dropbear } +pkg_postinst () { + update-alternatives --install ${bindir}/scp scp ${sbindir}/dropbearmulti 20 + update-alternatives --install ${bindir}/ssh ssh ${sbindir}/dropbearmulti 20 +} + pkg_postrm_append () { if [ -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then rm ${sysconfdir}/dropbear/dropbear_rsa_host_key diff --git a/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map b/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map index dbfde00053..dc7fa37401 100755 --- a/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map +++ b/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map @@ -30,7 +30,7 @@ keycode 13 = keycode 14 = BackSpace altgr keycode 14 = Delete keycode 15 = Tab - altgr keycode 15 = Caps_Lock + shift keycode 65 = Caps_Lock keycode 16 = q keycode 17 = w altgr keycode 17 = asciicircum @@ -143,71 +143,71 @@ string Prior = "\033[5~" string Next = "\033[6~" string Macro = "\033[M" string Pause = "\033[P" -compose '`' 'A' to 'À' -compose '`' 'a' to 'à' -compose '\'' 'A' to 'Á' -compose '\'' 'a' to 'á' -compose '^' 'A' to 'Â' -compose '^' 'a' to 'â' -compose '~' 'A' to 'Ã' -compose '~' 'a' to 'ã' -compose '"' 'A' to 'Ä' -compose '"' 'a' to 'ä' -compose 'O' 'A' to 'Å' -compose 'o' 'a' to 'å' -compose '0' 'A' to 'Å' -compose '0' 'a' to 'å' -compose 'A' 'A' to 'Å' -compose 'a' 'a' to 'å' -compose 'A' 'E' to 'Æ' -compose 'a' 'e' to 'æ' -compose ',' 'C' to 'Ç' -compose ',' 'c' to 'ç' -compose '`' 'E' to 'È' -compose '`' 'e' to 'è' -compose '\'' 'E' to 'É' -compose '\'' 'e' to 'é' -compose '^' 'E' to 'Ê' -compose '^' 'e' to 'ê' -compose '"' 'E' to 'Ë' -compose '"' 'e' to 'ë' -compose '`' 'I' to 'Ì' -compose '`' 'i' to 'ì' -compose '\'' 'I' to 'Í' -compose '\'' 'i' to 'í' -compose '^' 'I' to 'Î' -compose '^' 'i' to 'î' -compose '"' 'I' to 'Ï' -compose '"' 'i' to 'ï' -compose '-' 'D' to 'Ð' -compose '-' 'd' to 'ð' -compose '~' 'N' to 'Ñ' -compose '~' 'n' to 'ñ' -compose '`' 'O' to 'Ò' -compose '`' 'o' to 'ò' -compose '\'' 'O' to 'Ó' -compose '\'' 'o' to 'ó' -compose '^' 'O' to 'Ô' -compose '^' 'o' to 'ô' -compose '~' 'O' to 'Õ' -compose '~' 'o' to 'õ' -compose '"' 'O' to 'Ö' -compose '"' 'o' to 'ö' -compose '/' 'O' to 'Ø' -compose '/' 'o' to 'ø' -compose '`' 'U' to 'Ù' -compose '`' 'u' to 'ù' -compose '\'' 'U' to 'Ú' -compose '\'' 'u' to 'ú' -compose '^' 'U' to 'Û' -compose '^' 'u' to 'û' -compose '"' 'U' to 'Ü' -compose '"' 'u' to 'ü' -compose '\'' 'Y' to 'Ý' -compose '\'' 'y' to 'ý' -compose 'T' 'H' to 'Þ' -compose 't' 'h' to 'þ' -compose 's' 's' to 'ß' -compose '"' 'y' to 'ÿ' -compose 's' 'z' to 'ß' -compose 'i' 'j' to 'ÿ' +compose '`' 'A' to '' +compose '`' 'a' to '' +compose '\'' 'A' to '' +compose '\'' 'a' to '' +compose '^' 'A' to '' +compose '^' 'a' to '' +compose '~' 'A' to '' +compose '~' 'a' to '' +compose '"' 'A' to '' +compose '"' 'a' to '' +compose 'O' 'A' to '' +compose 'o' 'a' to '' +compose '0' 'A' to '' +compose '0' 'a' to '' +compose 'A' 'A' to '' +compose 'a' 'a' to '' +compose 'A' 'E' to '' +compose 'a' 'e' to '' +compose ',' 'C' to '' +compose ',' 'c' to '' +compose '`' 'E' to '' +compose '`' 'e' to '' +compose '\'' 'E' to '' +compose '\'' 'e' to '' +compose '^' 'E' to '' +compose '^' 'e' to '' +compose '"' 'E' to '' +compose '"' 'e' to '' +compose '`' 'I' to '' +compose '`' 'i' to '' +compose '\'' 'I' to '' +compose '\'' 'i' to '' +compose '^' 'I' to '' +compose '^' 'i' to '' +compose '"' 'I' to '' +compose '"' 'i' to '' +compose '-' 'D' to '' +compose '-' 'd' to '' +compose '~' 'N' to '' +compose '~' 'n' to '' +compose '`' 'O' to '' +compose '`' 'o' to '' +compose '\'' 'O' to '' +compose '\'' 'o' to '' +compose '^' 'O' to '' +compose '^' 'o' to '' +compose '~' 'O' to '' +compose '~' 'o' to '' +compose '"' 'O' to '' +compose '"' 'o' to '' +compose '/' 'O' to '' +compose '/' 'o' to '' +compose '`' 'U' to '' +compose '`' 'u' to '' +compose '\'' 'U' to '' +compose '\'' 'u' to '' +compose '^' 'U' to '' +compose '^' 'u' to '' +compose '"' 'U' to '' +compose '"' 'u' to '' +compose '\'' 'Y' to '' +compose '\'' 'y' to '' +compose 'T' 'H' to '' +compose 't' 'h' to '' +compose 's' 's' to '' +compose '"' 'y' to '' +compose 's' 'z' to '' +compose 'i' 'j' to '' diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index bf60cec12f..99b2a7dfbd 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -6,7 +6,7 @@ DEPENDS = "makedevs" DEPENDS_openzaurus = "makedevs virtual/kernel" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r53" +PR = "r54" SRC_URI = "file://halt \ file://ramdisk \ diff --git a/packages/linux/linux-openzaurus_2.6.13-rc3-mm3.bb b/packages/linux/linux-openzaurus_2.6.13-rc3-mm3.bb index 2c7042c7ca..7e7df86702 100644 --- a/packages/linux/linux-openzaurus_2.6.13-rc3-mm3.bb +++ b/packages/linux/linux-openzaurus_2.6.13-rc3-mm3.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" KV = "${@bb.data.getVar('PV',d,True)}" -PR = "r0" +PR = "r1" DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches" @@ -25,6 +25,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.13-rc3.bz2;patch=1 \ ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.13-rc3/2.6.13-rc3-mm3/2.6.13-rc3-mm3.bz2;patch=1 \ ${RPSRC}/2.6.13-rc3-mm3_fix-r0.patch;patch=1 \ + ${RPSRC}/reverse_pagefault-r0.patch;patch=1 \ ${RPSRC}/preempt_nwfpe-r2.patch;patch=1 \ ${RPSRC}/oprofile_typo-r0.patch;patch=1 \ ${RPSRC}/corgi_tspmu-r2.patch;patch=1 \ @@ -40,14 +41,14 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ${RPSRC}/sharp_multi_pcmcia-r2.patch;patch=1 \ ${RPSRC}/input_power-r2.patch;patch=1 \ ${RPSRC}/corgi_irda-r2.patch;patch=1 \ - ${RPSRC}/corgi_base_extras1-r2.patch;patch=1 \ + ${RPSRC}/corgi_base_extras1-r3.patch;patch=1 \ ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \ ${RPSRC}/corgi_power-r24.patch;patch=1 \ ${RPSRC}/corgi_power1-r1.patch;patch=1 \ ${RPSRC}/mmc_sd-r5.patch;patch=1 \ ${DOSRC}/mmc-bulk-r0.patch;patch=1 \ ${RPSRC}/mmc_timeout-r0.patch;patch=1 \ - ${RPSRC}/corgi_snd-r6.patch;patch=1 \ + ${RPSRC}/corgi_snd-r8.patch;patch=1 \ ${DOSRC}/rmk-i2c-pxa-r0.patch;patch=1 \ ${RPSRC}/spitz_mtd-r0.patch;patch=1 \ ${RPSRC}/ipaq/hx2750_base-r19.patch;patch=1 \ diff --git a/packages/meta/openslug-native-packages.bb b/packages/meta/openslug-native-packages.bb new file mode 100644 index 0000000000..d856bbfe87 --- /dev/null +++ b/packages/meta/openslug-native-packages.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Packages that are to be compiled nativly for the OpenSlug firmware" +LICENSE = MIT +PR = "r1" + +INHIBIT_DEFAULT_DEPS = "1" +ALLOW_EMPTY = 1 +PACKAGES = "${PN}" + +OPENSLUG_NATIVE_PACKAGES = "\ + " + +BROKEN_PACKAGES = "\ + " + +DEPENDS = '${OPENSLUG_NATIVE_PACKAGES} \ + package-index' diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb index 7e248bc60e..1e53d342d2 100644 --- a/packages/meta/openslug-packages.bb +++ b/packages/meta/openslug-packages.bb @@ -34,24 +34,20 @@ OPENSLUG_DEVELOPMENT = "\ openssh \ patch \ pciutils \ + perl \ pkgconfig \ quilt \ sed \ strace \ - util-linux \ - " - -# These packages only build on TARGET_OS=linux, not -# TARGET_OS=linux-uclibc -OPENSLUG_DEVELOPMENT_append_linux = "\ - perl \ tar \ + util-linux \ " OPENSLUG_PACKAGES = "\ atftp \ bash \ + bind \ bluez-utils-nodbus \ bridge-utils \ bwmon \ @@ -60,6 +56,7 @@ OPENSLUG_PACKAGES = "\ cron \ cvs\ cyrus-imapd \ + db4 \ dnsmasq \ expat \ ftpd-topfield \ @@ -67,61 +64,52 @@ OPENSLUG_PACKAGES = "\ gphoto2 \ gtk-doc \ less \ + libpam \ libusb \ libxml2 \ + man man-pages \ + mgetty \ miau \ microcom \ + mpd \ mt-daapd \ mutt \ mysql \ nail \ nano \ ncftp \ + nfs-utils \ + ntp \ obexftp openobex openobex-apps ircp \ + openldap \ + openntpd \ openssh \ openvpn \ pcre \ + php \ + postfix \ ppp \ procps \ + psmisc \ puppy \ pwc \ + python \ + reiserfsprogs reiser4progs \ rsync \ + samba \ + sane-backends \ + screen \ setpwc \ + strace \ + streamripper \ sudo \ sysfsutils \ thttpd \ - db4 \ - openldap \ - openntpd \ - ntp \ - reiserfsprogs reiser4progs \ - python \ - samba \ - sane-backends \ - strace \ thttpd \ + timezones \ + unionfs-modules unionfs-utils \ vlan \ wget \ - unionfs-modules unionfs-utils \ - " - -# These packages only build on TARGET_OS=linux, not -# TARGET_OS=linux-uclibc (Note that for several this -# is because of use of single precision FP interfaces -# such as sinf.) -OPENSLUG_PACKAGES_append_linux = "\ - bind \ - man man-pages \ - mgetty \ - mpd \ - nfs-utils \ - libpam \ - php \ - postfix \ - psmisc \ - screen \ - streamripper \ - timezones \ xinetd \ yp-tools ypbind ypserv \ " diff --git a/packages/meta/ucslugc-packages.bb b/packages/meta/ucslugc-packages.bb new file mode 100644 index 0000000000..afd029bc30 --- /dev/null +++ b/packages/meta/ucslugc-packages.bb @@ -0,0 +1,131 @@ +# Meta package containing all the packages which build for UcSlugC +# +# All packages in here must build with the ucslugc.conf distro, they +# do not necessarily work. +DESCRIPTION = "Packages that are compatible with the UcSlugC firmware" +LICENSE = MIT +PR = "r0" + +INHIBIT_DEFAULT_DEPS = "1" +ALLOW_EMPTY = 1 +PACKAGES = "${PN}" + +# The list of packages to build for the ucslugc DISTRO. +# KEEP IN ALPHABETICAL ORDER +UCSLUGC_PACKAGES = "\ + atftp \ + autoconf \ + automake \ + bash \ + bash \ + binutils \ + bison \ + bluez-utils-nodbus \ + bridge-utils \ + bwmon \ + bzip2 \ + ccxstream \ + coreutils \ + coreutils \ + cron \ + cvs \ + cvs\ + cyrus-imapd \ + db4 \ + diffutils \ + dnsmasq \ + expat \ + findutils \ + flex \ + ftpd-topfield \ + gawk \ + gcc \ + gdb \ + glib-2.0 \ + gnu-config \ + gphoto2 \ + grep \ + gtk-doc \ + gzip \ + ipkg-utils \ + less \ + libtool \ + libusb \ + libxml2 \ + lsof \ + m4 \ + make \ + miau \ + microcom \ + monotone-4 monotone-5 \ + mt-daapd \ + mutt \ + mysql \ + nail \ + nano \ + ncftp \ + ncurses \ + ntp \ + obexftp openobex openobex-apps ircp \ + openldap \ + openntpd \ + openssh \ + openssh \ + openvpn \ + patch \ + pciutils \ + pcre \ + pkgconfig \ + ppp \ + procps \ + puppy \ + pwc \ + python \ + quilt \ + reiserfsprogs reiser4progs \ + rsync \ + samba \ + sane-backends \ + sed \ + setpwc \ + strace \ + strace \ + sudo \ + sysfsutils \ + thttpd \ + thttpd \ + unionfs-modules unionfs-utils \ + util-linux \ + vlan \ + wget \ + " + +# These packages only build on TARGET_OS=linux, but not TARGET_OS=linux-uclibc. +# KEEP IN ALPHABETICAL ORDER +UCSLUGC_BROKEN_PACKAGES = "\ + bind \ + libpam \ + man man-pages \ + mgetty \ + mpd \ + perl \ + php \ + postfix \ + psmisc \ + screen \ + streamripper \ + tar \ + timezones \ + xinetd \ + " + +# These packages will never build because uclibc lacks (and always will lack) +# appropriate support. This define is for documentation of this fact! +UCSLUGC_UNSUPPORTABLE_PACKAGES = "\ + nfs-utils \ + yp-tools ypbind ypserv \ + " + +# The package-index at the end causes regeneration of the Packages.gz and +# other control files. +DEPENDS = "openslug-image ${UCSLUGC_PACKAGES} package-index" diff --git a/packages/openssh/openssh_4.0p1.bb b/packages/openssh/openssh_4.0p1.bb index e3f78c2de5..47225eb532 100644 --- a/packages/openssh/openssh_4.0p1.bb +++ b/packages/openssh/openssh_4.0p1.bb @@ -11,7 +11,7 @@ used to provide applications with a secure communication channel." HOMEPAGE = "http://www.openssh.org/" LICENSE = "BSD" MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>" -PR = "r1" +PR = "r4" SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \ file://configure.patch;patch=1 \ @@ -46,11 +46,13 @@ do_compile_append () { do_install_append() { install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/sshd + mv ${D}${bindir}/scp ${D}${bindir}/scp.openssh + mv ${D}${bindir}/ssh ${D}${bindir}/ssh.openssh } PACKAGES =+ " openssh-scp openssh-ssh openssh-sshd openssh-sftp openssh-misc" -FILES_openssh-scp = "${bindir}/scp" -FILES_openssh-ssh = "${bindir}/ssh ${bindir}/slogin /${sysconfdir}/ssh/ssh_config" +FILES_openssh-scp = "${bindir}/scp.${PN}" +FILES_openssh-ssh = "${bindir}/ssh.${PN} ${bindir}/slogin /${sysconfdir}/ssh/ssh_config" FILES_openssh-sshd = "${sbindir}/sshd /${sysconfdir}/init.d/sshd ${bindir}/ssh-keygen" FILES_openssh-sshd += " /${sysconfdir}/ssh/moduli /${sysconfdir}/ssh/sshd_config /var/run/sshd" FILES_openssh-sftp = "${bindir}/sftp ${libdir}exec/sftp-server" @@ -65,10 +67,18 @@ if test "x$D" != "x"; then else addgroup sshd adduser --system --home /var/run/sshd --no-create-home --disabled-password --ingroup sshd -s /bin/false sshd - update-rc.d sshd defaults + update-rc.d sshd defaults 9 fi } +pkg_postinst_openssh-scp() { + update-alternatives --install ${bindir}/scp scp scp.${PN} 90 +} + +pkg_postinst_openssh-ssh() { + update-alternatives --install ${bindir}/ssh ssh ssh.${PN} 90 +} + pkg_postrm_openssh-sshd() { if test "x$D" != "x"; then exit 1 diff --git a/packages/procps/procps-3.2.5/install.patch b/packages/procps/procps-3.2.5/install.patch index a05eec4ab6..9f1ef6915d 100644 --- a/packages/procps/procps-3.2.5/install.patch +++ b/packages/procps/procps-3.2.5/install.patch @@ -1,25 +1,27 @@ -*** procps-3.2.5/Makefile.orig Sun Jul 24 03:29:32 2005 ---- procps-3.2.5/Makefile Sun Jul 24 03:30:14 2005 -*************** -*** 211,220 **** - ###### install - - $(BINFILES) : all -! $(install) --mode a=rx $(notdir $@) $@ - - $(MANFILES) : all -! $(install) --mode a=r $(notdir $@) $@ - - install: $(filter-out $(SKIP) $(addprefix $(DESTDIR),$(SKIP)),$(INSTALL)) - cd $(usr/bin) && $(ln_f) skill snice ---- 211,220 ---- - ###### install - - $(BINFILES) : all -! $(install) -m 555 $(notdir $@) $@ - - $(MANFILES) : all -! $(install) -m 444 $(notdir $@) $@ - - install: $(filter-out $(SKIP) $(addprefix $(DESTDIR),$(SKIP)),$(INSTALL)) - cd $(usr/bin) && $(ln_f) skill snice +--- procps-3.2.5.virgin/Makefile 2005-01-26 05:55:26.000000000 +0100 ++++ procps-3.2.5/Makefile 2005-08-03 04:55:26.346984488 +0200 +@@ -30,7 +30,10 @@ + install := install -D --owner 0 --group 0 + + # Lame x86-64 /lib64 and /usr/lib64 abomination: +-lib64 := lib$(shell [ -d /lib64 ] && echo 64) ++# lib64 := lib$(shell [ -d /lib64 ] && echo 64) ++ ++# Equally lame hack to work around makefile lameness when the host arch is 64bit, but the target is not. ++lib64 := lib + + usr/bin := $(DESTDIR)/usr/bin/ + bin := $(DESTDIR)/bin/ +@@ -211,10 +214,10 @@ + ###### install + + $(BINFILES) : all +- $(install) --mode a=rx $(notdir $@) $@ ++ $(install) -m 555 $(notdir $@) $@ + + $(MANFILES) : all +- $(install) --mode a=r $(notdir $@) $@ ++ $(install) -m 444 $(notdir $@) $@ + + install: $(filter-out $(SKIP) $(addprefix $(DESTDIR),$(SKIP)),$(INSTALL)) + cd $(usr/bin) && $(ln_f) skill snice diff --git a/packages/procps/procps_3.2.5.bb b/packages/procps/procps_3.2.5.bb index 51e37a106b..21b2783e55 100644 --- a/packages/procps/procps_3.2.5.bb +++ b/packages/procps/procps_3.2.5.bb @@ -7,7 +7,7 @@ SECTION = "base" PRIORITY = "optional" MAINTAINER = "Inge Arnesen <inge.arnesen@gmail.com>" DEPENDS = "ncurses" -PR = "r1" +PR = "r2" SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \ file://install.patch;patch=1 \ diff --git a/packages/samba/samba_3.0.14a.bb b/packages/samba/samba_3.0.14a.bb index 3c660ed5c1..c008fe27f5 100644 --- a/packages/samba/samba_3.0.14a.bb +++ b/packages/samba/samba_3.0.14a.bb @@ -1,4 +1,4 @@ -PR = "r11" +PR = "r12" SRC_URI = "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \ file://configure.patch;patch=1 \ @@ -17,7 +17,7 @@ INITSCRIPT_NAME = "samba" # level, later levels put the shutdown later too - see the links # in rc6.d, the shutdown must precede network shutdown). INITSCRIPT_PARAMS = "defaults" -#CONFFILES_${PN} = "${sysconfdir}/samba/smb.conf" +CONFFILES_${PN} = "${sysconfdir}/samba/smb.conf" # The file system settings --foodir=dirfoo and overridden unconditionally # in the samba config by --with-foodir=dirfoo - even if the --with is not |