[oe-commits] org.oe.dev merge of '6114e88c0acc202895c41c560c0546244d2c5227'
oe commit
openembedded-commits at lists.openembedded.org
Thu Nov 22 01:45:50 UTC 2007
merge of '6114e88c0acc202895c41c560c0546244d2c5227'
and 'c971ec89c74107b683a418e2b491026999418bc4'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 0c1bf31806b2e4fc83b4405655fc3b14a98915c5
ViewMTN: http://monotone.openembedded.org/revision/info/0c1bf31806b2e4fc83b4405655fc3b14a98915c5
Files:
1
packages/gcc/gcc-4.1.2/pr34130.patch
packages/gcc/gcc-cross_4.1.2.bb
packages/gcc/gcc_4.1.2.bb
packages/autofs/autofs-4.1.4/no-bash.patch
packages/portmap/portmap-6.0/no-pie.patch
packages/autofs/autofs_4.1.4.bb
packages/meta/slugos-packages.bb
packages/portmap/portmap_6.0.bb
packages/slugos-init/files/turnup
packages/slugos-init/slugos-init_0.10.bb
Diffs:
#
# mt diff -r6114e88c0acc202895c41c560c0546244d2c5227 -r0c1bf31806b2e4fc83b4405655fc3b14a98915c5
#
#
#
# add_file "packages/gcc/gcc-4.1.2/pr34130.patch"
# content [23564cf74db7c5330d103f2b44e167ad2ef97eba]
#
# patch "packages/gcc/gcc-cross_4.1.2.bb"
# from [a848d98b3c6945c2d1c6945793cd4c470e593886]
# to [83f877f5f2ae3f14b9bf2a68b64d508fd1835087]
#
# patch "packages/gcc/gcc_4.1.2.bb"
# from [520d602fe4601361883e3c07caf5990c6203f558]
# to [f83d37a6eb350627b87317b6e2b770377361267e]
#
============================================================
--- packages/gcc/gcc-4.1.2/pr34130.patch 23564cf74db7c5330d103f2b44e167ad2ef97eba
+++ packages/gcc/gcc-4.1.2/pr34130.patch 23564cf74db7c5330d103f2b44e167ad2ef97eba
@@ -0,0 +1,16 @@
+Index: gcc-4.1.2/gcc/fold-const.c
+===================================================================
+--- gcc-4.1.2.orig/gcc/fold-const.c 2007-11-21 18:53:42.000000000 +0100
++++ gcc-4.1.2/gcc/fold-const.c 2007-11-21 18:56:26.000000000 +0100
+@@ -5339,7 +5339,10 @@
+ }
+ break;
+ }
+- /* FALLTHROUGH */
++ /* If the constant is negative, we cannot simplify this. */
++ if (tree_int_cst_sgn (c) == -1)
++ break;
++ /* FALLTHROUGH */
+ case NEGATE_EXPR:
+ if ((t1 = extract_muldiv (op0, c, code, wide_type)) != 0)
+ return fold_build1 (tcode, ctype, fold_convert (ctype, t1));
============================================================
--- packages/gcc/gcc-cross_4.1.2.bb a848d98b3c6945c2d1c6945793cd4c470e593886
+++ packages/gcc/gcc-cross_4.1.2.bb 83f877f5f2ae3f14b9bf2a68b64d508fd1835087
@@ -1,11 +1,11 @@ FILESDIR = "${@os.path.dirname(bb.data.g
require gcc_${PV}.bb
# path mangling, needed by the cross packaging
require gcc-paths-cross.inc
inherit cross
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
-# NOTE: split PR. If the main .oe changes something that affects its *build*
+# NOTE: split PR. If the main .bb changes something that affects its *build*
# remember to increment this one too.
-PR = "r10"
+PR = "r11"
DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
============================================================
--- packages/gcc/gcc_4.1.2.bb 520d602fe4601361883e3c07caf5990c6203f558
+++ packages/gcc/gcc_4.1.2.bb f83d37a6eb350627b87317b6e2b770377361267e
@@ -1,8 +1,10 @@
-PR = "r7"
DESCRIPTION = "The GNU cc and gcc C compilers."
HOMEPAGE = "http://www.gnu.org/software/gcc/"
SECTION = "devel"
LICENSE = "GPL"
+# NOTE: split PR. If the main .bb changes something that affects its *build*
+# remember to increment the -cross .bb PR too.
+PR = "r8"
inherit autotools gettext
@@ -32,6 +34,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc
file://cache-amnesia.patch;patch=1 \
file://gfortran.patch;patch=1 \
file://gcc-4.0.2-e300c2c3.patch;patch=1 \
+ file://pr34130.patch;patch=1 \
"
SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 "
#
# mt diff -rc971ec89c74107b683a418e2b491026999418bc4 -r0c1bf31806b2e4fc83b4405655fc3b14a98915c5
#
#
#
# add_file "packages/autofs/autofs-4.1.4/no-bash.patch"
# content [4eb3ed80313c234e6bd2311751e62211135fe24e]
#
# add_file "packages/portmap/portmap-6.0/no-pie.patch"
# content [39990f66702db50dd93420291a2edf4e018b16f0]
#
# patch "packages/autofs/autofs_4.1.4.bb"
# from [a424c6e4fee37df1589d0181c14420a3bc3267c2]
# to [5f81c9c9ebfabe495127eafbda0ce1c2d3ffa5b7]
#
# patch "packages/meta/slugos-packages.bb"
# from [710798742d5727a86f4c0272ea66e003273c4b35]
# to [9c53992007de6add7732c5842fecc57b3f45128e]
#
# patch "packages/portmap/portmap_6.0.bb"
# from [03ff99fa49ea46ef110fd480411ca9033f51e14e]
# to [241baf929c36235b1a707377a729d0d306119226]
#
# patch "packages/slugos-init/files/turnup"
# from [0c939e1149cd95e3b6553c5766ba09a3a3984ada]
# to [9b5fe01bdf98e32a3d849b4f44d57f5329ac5862]
#
# patch "packages/slugos-init/slugos-init_0.10.bb"
# from [35c419193e544a8d85ce740472291aa93c87fd37]
# to [e7df4dcb886e06a53c2e126edfc7dd3ce44f636c]
#
============================================================
--- packages/autofs/autofs-4.1.4/no-bash.patch 4eb3ed80313c234e6bd2311751e62211135fe24e
+++ packages/autofs/autofs-4.1.4/no-bash.patch 4eb3ed80313c234e6bd2311751e62211135fe24e
@@ -0,0 +1,18 @@
+diff -Naur autofs-4.1.4/samples.orig/auto.net autofs-4.1.4/samples/auto.net
+--- autofs-4.1.4/samples.orig/auto.net 2007-11-21 11:29:57.000000000 -0600
++++ autofs-4.1.4/samples/auto.net 2007-11-21 11:30:27.000000000 -0600
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+
+ # $Id: auto.net,v 1.8 2005/04/05 13:02:09 raven Exp $
+
+diff -Naur autofs-4.1.4/samples.orig/auto.smb autofs-4.1.4/samples/auto.smb
+--- autofs-4.1.4/samples.orig/auto.smb 2007-11-21 11:29:57.000000000 -0600
++++ autofs-4.1.4/samples/auto.smb 2007-11-21 11:30:34.000000000 -0600
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+
+ # $Id: auto.smb,v 1.3 2005/04/05 13:02:09 raven Exp $
+
============================================================
--- packages/portmap/portmap-6.0/no-pie.patch 39990f66702db50dd93420291a2edf4e018b16f0
+++ packages/portmap/portmap-6.0/no-pie.patch 39990f66702db50dd93420291a2edf4e018b16f0
@@ -0,0 +1,14 @@
+--- portmap_6.0/Makefile.orig 2007-11-21 00:35:52.000000000 -0600
++++ portmap_6.0/Makefile 2007-11-21 00:37:23.000000000 -0600
+@@ -125,9 +125,9 @@
+ all: portmap pmap_dump pmap_set portmap.man
+
+ CPPFLAGS += $(HOSTS_ACCESS)
+-portmap: CFLAGS += -fpie
++#portmap: CFLAGS += -fpie
+ portmap: LDLIBS += $(WRAP_LIB)
+-portmap: LDFLAGS += -pie
++#portmap: LDFLAGS += -pie
+ portmap: portmap.o pmap_check.o from_local.o
+
+ from_local: CPPFLAGS += -DTEST
============================================================
--- packages/autofs/autofs_4.1.4.bb a424c6e4fee37df1589d0181c14420a3bc3267c2
+++ packages/autofs/autofs_4.1.4.bb 5f81c9c9ebfabe495127eafbda0ce1c2d3ffa5b7
@@ -1,8 +1,8 @@ LICENSE = "GPL"
DESCRIPTION = "Kernel based automounter for linux."
SECTION = "base"
LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-${PV}.tar.bz2 \
${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-4.1.4-misc-fixes.patch;patch=1 \
@@ -12,10 +12,14 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux
file://Makefile.rules-cross.patch;patch=1 \
file://install.patch;patch=1 \
file://auto.net-sort-option-fix.patch;patch=1 \
- file://autofs-additional-distros.patch;patch=1"
+ file://autofs-additional-distros.patch;patch=1 \
+ file://no-bash.patch;patch=1"
-inherit autotools
+inherit autotools update-rc.d
+INITSCRIPT_NAME = "autofs"
+INITSCRIPT_PARAMS = "defaults"
+
EXTRA_OEMAKE="TARGET_PREFIX=${TARGET_PREFIX}"
PARALLEL_MAKE = ""
============================================================
--- packages/meta/slugos-packages.bb 710798742d5727a86f4c0272ea66e003273c4b35
+++ packages/meta/slugos-packages.bb 9c53992007de6add7732c5842fecc57b3f45128e
@@ -5,7 +5,7 @@ LICENSE = "MIT"
DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
HOMEPAGE = "http://www.nslu2-linux.org"
LICENSE = "MIT"
-PR = "r40"
+PR = "r41"
CONFLICTS = "db3"
COMPATIBLE_MACHINE = "nslu2"
@@ -149,6 +149,7 @@ SLUGOS_PACKAGES = "\
net-tools \
netcat \
netpbm \
+ nfs-utils \
nmap \
ntfs-3g \
ntp \
@@ -166,6 +167,7 @@ SLUGOS_PACKAGES = "\
picocom \
pkgconfig \
popt \
+ portmap \
postfix \
ppp \
procps \
@@ -229,7 +231,6 @@ SLUGOS_BROKEN_PACKAGES = "\
fetchmail \
lirc-modules lirc \
madfu \
- portmap nfs-utils \
openldap \
pvrusb2-mci \
pwc \
============================================================
--- packages/portmap/portmap_6.0.bb 03ff99fa49ea46ef110fd480411ca9033f51e14e
+++ packages/portmap/portmap_6.0.bb 241baf929c36235b1a707377a729d0d306119226
@@ -1,11 +1,16 @@ require portmap.inc
require portmap.inc
+PR = "r1"
+
SRC_URI = "http://neil.brown.name/portmap/portmap-6.0.tgz \
file://destdir-no-strip.patch;patch=1 \
file://no-tcpd-support.patch;patch=1 \
file://no-libwrap.patch;patch=1;pnum=0 \
file://portmap.init "
+# Remove this patch when SlugOS upgrades to binutils 1.18
+SRC_URI_append_slugos = " file://no-pie.patch;patch=1 "
+
S = "${WORKDIR}/${PN}_${PV}/"
CPPFLAGS += "-DFACILITY=LOG_DAEMON -DENABLE_DNS"
============================================================
--- packages/slugos-init/files/turnup 0c939e1149cd95e3b6553c5766ba09a3a3984ada
+++ packages/slugos-init/files/turnup 9b5fe01bdf98e32a3d849b4f44d57f5329ac5862
@@ -28,6 +28,7 @@ f root root 0664 /var/log/wtmp none
d root root 0755 /var/lib/dropbear none
d root root 0755 /var/lib/misc none
f root root 0664 /var/log/wtmp none
+f root root 0664 /var/log/lastlog none
f root root 0664 /var/run/utmp none"
INRAM_NFS="\
@@ -50,6 +51,7 @@ f root root 0664 /var/log/wtmp none
d root root 0755 /var/lib/misc none
d root root 0755 /var/lib/ipkg none
f root root 0664 /var/log/wtmp none
+f root root 0664 /var/log/lastlog none
f root root 0664 /var/run/utmp none"
INRAM_DISK="\
@@ -68,6 +70,7 @@ f root root 0664 /var/log/wtmp none
d root root 0755 /var/lib/misc none
d root root 0755 /var/lib/ipkg none
f root root 0664 /var/log/wtmp none
+f root root 0664 /var/log/lastlog none
f root root 0664 /var/run/utmp none"
INRAM_HEADER="\
============================================================
--- packages/slugos-init/slugos-init_0.10.bb 35c419193e544a8d85ce740472291aa93c87fd37
+++ packages/slugos-init/slugos-init_0.10.bb e7df4dcb886e06a53c2e126edfc7dd3ce44f636c
@@ -1,10 +1,10 @@ RDEPENDS = "busybox devio"
DESCRIPTION = "SlugOS initial network config via sysconf"
SECTION = "base"
PRIORITY = "required"
LICENSE = "GPL"
DEPENDS = "base-files devio"
RDEPENDS = "busybox devio"
-PR = "r89"
+PR = "r90"
SRC_URI = "file://boot/flash \
file://boot/disk \
More information about the Openembedded-commits
mailing list