[oe-commits] org.oe.dev merge of '1c6f6c20e33c23b718478f231d96591d2f567483'
mickeyl commit
openembedded-commits at lists.openembedded.org
Sat Nov 17 13:08:16 UTC 2007
merge of '1c6f6c20e33c23b718478f231d96591d2f567483'
and '7b1dd96801f47207bea137bdc1cda343863a75ce'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 3021686956bdcf5b95480557bdd87b8892e303a8
ViewMTN: http://monotone.openembedded.org/revision/info/3021686956bdcf5b95480557bdd87b8892e303a8
Files:
1
packages/iptables/files/getsockopt-failed.patch
packages/iptables/iptables_1.3.8.bb
packages/notecase/notecase-1.7.2
packages/fuse/fuse-module_2.7.1.bb
packages/notecase/notecase-1.7.2/no-hardcoded-cxx.patch
packages/notecase/notecase_1.7.2.bb
classes/package.bbclass
packages/base-files/base-files_3.0.14.bb
packages/matchbox-common/matchbox-common_0.9.1.bb
Diffs:
#
# mt diff -r1c6f6c20e33c23b718478f231d96591d2f567483 -r3021686956bdcf5b95480557bdd87b8892e303a8
#
#
#
# add_file "packages/iptables/files/getsockopt-failed.patch"
# content [38ab94e3fbbab5bb7dee894315a8d1cbc39ba972]
#
# patch "packages/iptables/iptables_1.3.8.bb"
# from [c113e9d38b20dc53603f06d7376e50c77dcbf070]
# to [83d804879e6ab91717d2adb82237eb57d5a4f291]
#
============================================================
--- packages/iptables/files/getsockopt-failed.patch 38ab94e3fbbab5bb7dee894315a8d1cbc39ba972
+++ packages/iptables/files/getsockopt-failed.patch 38ab94e3fbbab5bb7dee894315a8d1cbc39ba972
@@ -0,0 +1,28 @@
+This patch fixes an issue where iptables throws the following error:
+"getsockopt failed strangely". This patch is taken from the netfilter
+svn (and it's included in iptable 1.4.0rc1):
+
+http://svn.netfilter.org/cgi-bin/viewcvs.cgi?rev=6890&view=rev
+
+--- iptables/iptables.c 2007/04/30 00:01:39 6815
++++ iptables/iptables.c 2007/06/26 15:29:45 6890
+@@ -1158,7 +1158,7 @@
+ max_rev = getsockopt(sockfd, IPPROTO_IP, opt, &rev, &s);
+ if (max_rev < 0) {
+ /* Definitely don't support this? */
+- if (errno == EPROTONOSUPPORT) {
++ if (errno == ENOENT || errno == EPROTONOSUPPORT) {
+ close(sockfd);
+ return 0;
+ } else if (errno == ENOPROTOOPT) {
+--- iptables/ip6tables.c 2007/06/25 14:55:18 6889
++++ iptables/ip6tables.c 2007/06/26 15:29:45 6890
+@@ -1130,7 +1130,7 @@
+ max_rev = getsockopt(sockfd, IPPROTO_IPV6, opt, &rev, &s);
+ if (max_rev < 0) {
+ /* Definitely don't support this? */
+- if (errno == EPROTONOSUPPORT) {
++ if (errno == ENOENT || errno == EPROTONOSUPPORT) {
+ close(sockfd);
+ return 0;
+ } else if (errno == ENOPROTOOPT) {
============================================================
--- packages/iptables/iptables_1.3.8.bb c113e9d38b20dc53603f06d7376e50c77dcbf070
+++ packages/iptables/iptables_1.3.8.bb 83d804879e6ab91717d2adb82237eb57d5a4f291
@@ -1,10 +1,11 @@ RRECOMMENDS = "kernel-module-ip-tables k
DESCRIPTION = "iptables network filtering tools"
HOMEPAGE = "http://www.netfilter.org/"
SECTION = "console/utils"
LICENSE = "GPL"
RRECOMMENDS = "kernel-module-ip-tables kernel-module-iptable-filter"
-PR = "r0"
+PR = "r1"
SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \
+ file://getsockopt-failed.patch;patch=1 \
"
S = "${WORKDIR}/iptables-${PV}"
#
# mt diff -r7b1dd96801f47207bea137bdc1cda343863a75ce -r3021686956bdcf5b95480557bdd87b8892e303a8
#
#
#
# add_dir "packages/notecase/notecase-1.7.2"
#
# add_file "packages/fuse/fuse-module_2.7.1.bb"
# content [18508e3a2ef6dcff4b6e5195c41b8b231e169cf7]
#
# add_file "packages/notecase/notecase-1.7.2/no-hardcoded-cxx.patch"
# content [51ab9f2f39f13a1affed9594ed4bf1b08d5924ed]
#
# add_file "packages/notecase/notecase_1.7.2.bb"
# content [aeb0a547c5d487b7af7569f01b002beffd26546d]
#
# patch "classes/package.bbclass"
# from [1713a1d39b0249350a2277e9d734d92d920aaf16]
# to [5d45a61dc3bb51e27788fa8ef8316543e655f7d6]
#
# patch "packages/base-files/base-files_3.0.14.bb"
# from [56808741a8321e9f358d766697b017963b7292b4]
# to [d685e27eae8923fa524cfbe199b4219e38bceb6a]
#
# patch "packages/matchbox-common/matchbox-common_0.9.1.bb"
# from [68df8bc491f589a6f3e7b69e5b10ec838e6b621f]
# to [7351b821f0ea6c14c62b5749cfc7a701b937496b]
#
============================================================
--- packages/fuse/fuse-module_2.7.1.bb 18508e3a2ef6dcff4b6e5195c41b8b231e169cf7
+++ packages/fuse/fuse-module_2.7.1.bb 18508e3a2ef6dcff4b6e5195c41b8b231e169cf7
@@ -0,0 +1,29 @@
+require fuse.inc
+
+RRECOMMENDS = "fuse"
+PR = "r0"
+
+S = "${WORKDIR}/fuse-${PV}"
+FILES_${PN} = "/dev ${base_libdir}/modules ${sysconfdir}"
+EXTRA_OECONF = " --enable-kernel-module --with-kernel=${STAGING_KERNEL_DIR}"
+
+inherit module
+
+do_configure() {
+ cd ${S} ; oe_runconf
+}
+
+do_compile(){
+ LDFLAGS=""
+ cd ${S}/kernel
+ oe_runmake
+}
+
+fakeroot do_install() {
+ LDFLAGS=""
+ install -d ${D}${sysconfdir}/udev/rules.d/
+ install -m 644 util/udev.rules ${D}${sysconfdir}/udev/rules.d/
+ cd ${S}/kernel
+ oe_runmake install DESTDIR=${D}
+}
+
============================================================
--- packages/notecase/notecase-1.7.2/no-hardcoded-cxx.patch 51ab9f2f39f13a1affed9594ed4bf1b08d5924ed
+++ packages/notecase/notecase-1.7.2/no-hardcoded-cxx.patch 51ab9f2f39f13a1affed9594ed4bf1b08d5924ed
@@ -0,0 +1,38 @@
+--- tmp/Makefile 2007-05-08 12:25:10.000000000 +0200
++++ Makefile 2007-11-03 10:46:51.000000000 +0100
+@@ -131,7 +131,7 @@
+ ifdef WINDIR
+ LD=$(QL) $(CXX) $(DEBUG) $(PROFILE) $(LDFLAGS) -L$(OBJ) -lz
+ else
+- LD=$(QL) $(CXX) $(DEBUG) $(PROFILE) $(LDFLAGS) -ldl
++ NLD=$(QL) $(CXX) $(DEBUG) $(PROFILE) $(LOPTIMIZE) -ldl -export-dynamic $(LOPTIMIZE)
+ endif
+
+ #
+@@ -190,7 +190,7 @@
+ LIBS += hildon-libs hildon-fm libosso
+ endif
+
+-GTKCFLAGS=`pkg-config --cflags $(LIBS)` -I/target/include -I/sw/include
++GTKCFLAGS=`pkg-config --cflags $(LIBS)`
+ GTKLIBS=`pkg-config --libs $(LIBS)`
+
+ #
+@@ -201,7 +201,7 @@
+ $(LD) $(OBJS) -o $(BIN)/notecase$(EXE) $(FLAGS) $(LDFLAGS) $(GTKLIBS)
+ else
+ notecase$(EXE): updatesrc $(OBJS)
+- $(LD) $(OBJS) -o $(BIN)/notecase$(EXE) $(FLAGS) $(LDFLAGS) $(GTKLIBS) > /dev/null
++ $(NLD) $(OBJS) -o $(BIN)/notecase$(EXE) $(FLAGS) $(LDFLAGS) $(GTKLIBS)
+ endif
+
+ #
+@@ -421,7 +421,7 @@
+ $(CC) $(FLAGS) -c $(GUIPATH)/DocActionFinishDel.cpp -o $(OBJ)/DocActionFinishDel.o $(GTKCFLAGS)
+
+ $(OBJ)/libz.a:
+- @cd ./src/lib/zlib/; $(MAKE); cp ./libz.a ../../../$(OBJ)/
++ @cd ./src/lib/zlib/; cp ./libz.a ../../../$(OBJ)/
+
+ $(OBJ)/ShortcutsList.o: $(GUIPATH)/ShortcutsList.cpp $(GUIPATH)/ShortcutsList.h
+ $(CC) $(FLAGS) -c $(GUIPATH)/ShortcutsList.cpp -o $(OBJ)/ShortcutsList.o $(GTKCFLAGS)
============================================================
--- packages/notecase/notecase_1.7.2.bb aeb0a547c5d487b7af7569f01b002beffd26546d
+++ packages/notecase/notecase_1.7.2.bb aeb0a547c5d487b7af7569f01b002beffd26546d
@@ -0,0 +1,17 @@
+require notecase.inc
+
+PR = "r1"
+
+do_install() {
+ install -d ${D}${bindir}
+ install -d ${D}${datadir}/applications
+ install -d ${D}${datadir}/doc
+ install -d ${D}${datadir}/doc/notecase
+ install -d ${D}${datadir}/icons
+ install -m 644 ${S}/docs/notecase.desktop ${D}${datadir}/applications
+ install -m 644 ${S}/docs/help.ncd ${D}${datadir}/doc/notecase/help.ncd
+ install -m 644 ${S}/res/notecase.xpm ${D}${datadir}/icons/notecase.xpm
+ install -m 755 ${S}/bin/notecase ${D}${bindir}/
+}
+
+FILES_${PN} += "${datadir}"
============================================================
--- classes/package.bbclass 1713a1d39b0249350a2277e9d734d92d920aaf16
+++ classes/package.bbclass 5d45a61dc3bb51e27788fa8ef8316543e655f7d6
@@ -485,8 +485,9 @@ python populate_packages () {
if file in seen:
continue
seen.append(file)
- if os.path.isdir(file):
+ if os.path.isdir(file) and not os.path.islink(file):
bb.mkdirhier(os.path.join(root,file))
+ os.chmod(os.path.join(root,file), os.stat(file).st_mode)
continue
fpath = os.path.join(root,file)
dpath = os.path.dirname(fpath)
============================================================
--- packages/base-files/base-files_3.0.14.bb 56808741a8321e9f358d766697b017963b7292b4
+++ packages/base-files/base-files_3.0.14.bb d685e27eae8923fa524cfbe199b4219e38bceb6a
@@ -1,7 +1,7 @@ PRIORITY = "required"
DESCRIPTION = "Miscellaneous files for the base system."
SECTION = "base"
PRIORITY = "required"
-PR = "r75"
+PR = "r76"
LICENSE = "GPL"
SRC_URI = " \
============================================================
--- packages/matchbox-common/matchbox-common_0.9.1.bb 68df8bc491f589a6f3e7b69e5b10ec838e6b621f
+++ packages/matchbox-common/matchbox-common_0.9.1.bb 7351b821f0ea6c14c62b5749cfc7a701b937496b
@@ -1,8 +1,8 @@ DEPENDS = "libmatchbox"
DESCRIPTION = "Matchbox window manager common files"
SECTION = "x11/wm"
LICENSE = "GPL"
DEPENDS = "libmatchbox"
-PR = "r4"
+PR = "r5"
SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz \
file://no-utilities-category.patch;patch=1 \
@@ -19,7 +19,7 @@ ALTERNATIVE_LINK = "${bindir}/x-window-m
ALTERNATIVE_NAME = "x-window-manager"
ALTERNATIVE_LINK = "${bindir}/x-window-manager"
-ALTERNATIVE_PATH = "${bindir}/matchbox-window-manager"
+ALTERNATIVE_PATH = "${bindir}/matchbox-session"
ALTERNATIVE_PRIORITY = "11"
More information about the Openembedded-commits
mailing list