Return-Path: Received: from mail-oi1-f196.google.com (mail-oi1-f196.google.com [209.85.167.196]) by mail.openembedded.org (Postfix) with ESMTP id B87136188E for ; Thu, 27 Feb 2020 21:29:56 +0000 (UTC) Received: by mail-oi1-f196.google.com with SMTP id 2so753915oiz.5 for ; Thu, 27 Feb 2020 13:29:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UogBglAXMT/V9OWnlSWKqIK7iryyV0BJh3kT7kUzEBs=; b=ZQjmRkUwTVvrnfwnUmnGojwZsLaNA2siqP+p0j7d6dVMAWeOBWaVZKOMvz+I+6AjVN zAFj8g4RNXnJYjkZkKJhHK3Tay36k01ExeILhG5fY8CmsdCzlkAt798/kIwaItaxgTHW tx7/3LMN+0dALPoycpyE8JNSh5826wJ2tHBDBX5QlgVYiYbZRU3v80sP2rW3N34ZYHWk JKPUCK9L8RHrDFfNSD6dElqxMleU8FgWnOG+3aKzR7XLcWvXnWraiHp2O7rp2afME6N2 y+yI0s4gyevW46SjOEr9d2YfaEjuY5F8UsB8otdH73RWD01Wljm6f3aup9cCaiWlJTOK uhMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UogBglAXMT/V9OWnlSWKqIK7iryyV0BJh3kT7kUzEBs=; b=C/aHzHBRRVmChx2pwUGKiWMFOeSJ4bFOk4AbduzAZ9/QVTZKV6VE9mQAtZ3Z86FERz kzu7crxEEyd2OUoLUwl3qam7ms/P64O9RZ+5foolOoQvxOZH/YlxQrj2ViZ71D7xeSgG 7NnRSGTd6ReyCh7pDSw0Emg7S4uTCvdZQ6JE4aHFi8TMlmlCdiBLq2KkzTcxavrxuIeX k0qq6F7i/RMpNlpS+J2hkWZQ5FNQYcROhaIko2lOh5O8d2G9Z7xKWMg8UemwqwcuChqO SZZGxG/zwCqnpl2AMQqjKo5UXhmna9EStJwOq4bVE7vNZEALn5NnDkHDmxo7KMQeur3U 0Chg== X-Gm-Message-State: APjAAAU/+rWPCJXtUBneUPF5/M/wRdhDT49CVQBjnZf46bMXWZMdV1Mj HqWS2gnaAOsR7ExJOI5+U90QV58OPxQ= X-Google-Smtp-Source: APXvYqwP9Z7VTIFQKpCXpCCsbHnsnxcYTGq2mbnEyEXmiq82zingwj1IUQpqOFi8G39vDx9mXBTxKg== X-Received: by 2002:aca:5303:: with SMTP id h3mr759910oib.109.1582838997303; Thu, 27 Feb 2020 13:29:57 -0800 (PST) Received: from dell5510.arch.suse.de ([62.201.25.198]) by smtp.gmail.com with ESMTPSA id c21sm2358656oiy.11.2020.02.27.13.29.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2020 13:29:56 -0800 (PST) From: Petr Vorel To: openembedded-core@lists.openembedded.org Date: Thu, 27 Feb 2020 22:29:40 +0100 Message-Id: <20200227212940.12327-2-petr.vorel@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200227212940.12327-1-petr.vorel@gmail.com> References: <20200227212940.12327-1-petr.vorel@gmail.com> MIME-Version: 1.0 Subject: [PATCH v3 2/2] ltp: Remove mips related open_posix_testsuite patch X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Feb 2020 21:29:56 -0000 Content-Transfer-Encoding: 8bit Upstream just disagree on this patch https://patchwork.ozlabs.org/comment/2012045/ Signed-off-by: Petr Vorel --- Changes v2->v3: NONE ...suite-mmap24-2-Relax-condition-a-bit.patch | 68 ------------------- meta/recipes-extended/ltp/ltp_20200120.bb | 1 - 2 files changed, 69 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch diff --git a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch b/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch deleted file mode 100644 index d32ac1dd7c..0000000000 --- a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch +++ /dev/null @@ -1,68 +0,0 @@ -From a8715a1446305ffd76406f63c7f160c13a5b2e72 Mon Sep 17 00:00:00 2001 -From: "Hongzhi.Song" -Date: Wed, 10 Oct 2018 22:07:05 -0400 -Subject: [PATCH] open_posix_testsuite/mmap24-2: Relax condition a bit - -Mips will return EINVAL instead of ENOMEM as expected -if the range [addr + len) exceeds TASK_SIZE. - -Linux kernel code: arch/mips/mm/mmap.c -if (flags & MAP_FIXED) { - /* Even MAP_FIXED mappings must reside within TASK_SIZE */ - if (TASK_SIZE - len < addr) - return -EINVAL; - -Relax the condition and accept both ENOMEM and EINVAL -as expected outcome. - -Upstream-Status: Submitted [https://lists.linux.it/pipermail/ltp/2018-October/009624.html] - -Signed-off-by: Hongzhi.Song ---- - .../open_posix_testsuite/conformance/interfaces/mmap/24-2.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -index 9cf83d9..55090a6 100644 ---- a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -+++ b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -@@ -7,7 +7,7 @@ - * source tree. - * - * The mmap() function shall fail if: -- * [ENOMEM] MAP_FIXED was specified, -+ * [ENOMEM or EINVAL] MAP_FIXED was specified, - * and the range [addr,addr+len) exceeds that allowed - * for the address space of a process; or, if MAP_FIXED was not specified and - * there is insufficient room in the address space to effect the mapping. -@@ -15,7 +15,7 @@ - * Test Step: - * 1. Map a shared memory object, with size exceeding the value get from - * rlim_cur of resource RLIMIT_AS, setting MAP_FIXED; -- * 3. Should get ENOMEM. -+ * 3. Should get ENOMEM or EINVAL. - */ - - #include -@@ -92,8 +92,8 @@ int main(void) - (unsigned long)len); - pa = mmap(addr, len, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, fd, - 0); -- if (pa == MAP_FAILED && errno == ENOMEM) { -- printf("Got ENOMEM: %s\nTest PASSED\n", strerror(errno)); -+ if (pa == MAP_FAILED && (errno == ENOMEM || errno == EINVAL)) { -+ printf("Got ENOMEM or EINVAL: %s\nTest PASSED\n", strerror(errno)); - exit(PTS_PASS); - } - -@@ -102,6 +102,6 @@ int main(void) - else - munmap(pa, len); - close(fd); -- printf("Test Fail: Did not get ENOMEM as expected\n"); -+ printf("Test Failed: Did not get ENOMEM or EINVAL as expected\n"); - return PTS_FAIL; - } --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp_20200120.bb b/meta/recipes-extended/ltp/ltp_20200120.bb index 579a763431..537cc72644 100644 --- a/meta/recipes-extended/ltp/ltp_20200120.bb +++ b/meta/recipes-extended/ltp/ltp_20200120.bb @@ -34,7 +34,6 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0004-guard-mallocopt-with-__GLIBC__.patch \ file://0007-Fix-test_proc_kill-hanging.patch \ file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ - file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \ file://0001-Add-more-musl-exclusions.patch \ file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \ " -- 2.25.1