From patchwork Tue Aug 25 09:38:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vicente Olivert Riera X-Patchwork-Id: 510422 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id D447214029C for ; Tue, 25 Aug 2015 19:38:45 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id E78A390F69; Tue, 25 Aug 2015 09:38:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5pkBCetrI9tH; Tue, 25 Aug 2015 09:38:41 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id C146690F3B; Tue, 25 Aug 2015 09:38:41 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 347B01C0E8B for ; Tue, 25 Aug 2015 09:38:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 30A7090F31 for ; Tue, 25 Aug 2015 09:38:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JhN3hwdjRQEg for ; Tue, 25 Aug 2015 09:38:39 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailapp01.imgtec.com (mailapp01.imgtec.com [195.59.15.196]) by whitealder.osuosl.org (Postfix) with ESMTP id D265290F3B for ; Tue, 25 Aug 2015 09:38:38 +0000 (UTC) Received: from KLMAIL01.kl.imgtec.org (unknown [192.168.5.35]) by Websense Email Security Gateway with ESMTPS id 90666B2FFBD9C; Tue, 25 Aug 2015 10:38:33 +0100 (IST) Received: from LEMAIL01.le.imgtec.org (192.168.152.62) by KLMAIL01.kl.imgtec.org (192.168.5.35) with Microsoft SMTP Server (TLS) id 14.3.195.1; Tue, 25 Aug 2015 10:38:36 +0100 Received: from [192.168.154.34] (192.168.154.34) by LEMAIL01.le.imgtec.org (192.168.152.62) with Microsoft SMTP Server (TLS) id 14.3.210.2; Tue, 25 Aug 2015 10:38:35 +0100 Message-ID: <55DC379B.5080606@imgtec.com> Date: Tue, 25 Aug 2015 10:38:35 +0100 From: Vicente Olivert Riera User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.8.0 MIME-Version: 1.0 To: universe II References: <55D70AF3.3050604@gmx.de> <55D72A86.1050505@imgtec.com> <55DB4584.1000102@gmx.de> In-Reply-To: <55DB4584.1000102@gmx.de> X-Originating-IP: [192.168.154.34] Cc: buildroot@busybox.net Subject: Re: [Buildroot] Add missing config to RPM target package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Dear Andreas, On 08/24/2015 05:25 PM, universe II wrote: > Am 21.08.2015 um 15:41 schrieb Vicente Olivert Riera: >> Dear Andreas, >> >>> diff -Naur a/package/rpm/rpm.mk b/package/rpm/rpm.mk >>> --- a/package/rpm/rpm.mk 2015-08-07 11:38:37.559148663 +0200 >>> +++ b/package/rpm/rpm.mk 2015-08-21 11:13:31.679042077 +0200 >>> @@ -34,7 +34,7 @@ >>> RPM_DEPENDENCIES += pcre >>> RPM_CONF_OPTS += --with-pcre=external >>> else >>> -RPM_CONF_OPTS += --with-pcre=none >>> +RPM_CONF_OPTS += --with-pcre=internal >>> endif >>> >>> ifeq ($(BR2_PACKAGE_FILE),y) >> I cannot apply your patch: >> >> $ wget http://patchwork.ozlabs.org/patch/509471/mbox/ -q -O - | git am >> Applying: Add missing config to RPM target package >> error: patch failed: package/rpm/rpm.mk:34 >> error: package/rpm/rpm.mk: patch does not apply >> Patch failed at 0001 Add missing config to RPM target package >> When you have resolved this problem run "git am --resolved". >> If you would prefer to skip this patch, instead run "git am --skip". >> To restore the original branch and stop patching run "git am --abort". >> >> Please make your patches using git, as stated in the Buildroot manual: >> >> http://buildroot.uclibc.org/downloads/manual/manual.html#submitting-patches >> >> >> Regards, >> >> Vincent. > Dear Vincent, > I tried to make my patch using git according to the manual, but I always > got an error. Maybe related to my inexperience with git. After 4 hours > of different tries I gave up and sent the patch via email. Sorry for the > inconvenience. > > Regards, > Andreas so, lets see if I can help you. 1- configure git in order to be able to use "git send-email" and also to sign your commits automatically when using "git commit -s". Here is an example of a ~/.gitconfig file: user@localhost ~ $ cat .gitconfig [sendemail] smtpencryption = tls smtpserver = your.mail.server.address.here smtpuser = "your.smtp.username" smtpserverport = 25 confirm = always [user] name = Your Full Name Here email = your.email@address.here user@localhost ~ $ That should be enough. But, if you need it, there is more information here: http://git-scm.com/docs/git-send-email 2- clone the Buildroot repository: user@localhost ~ $ git clone git://git.busybox.net/buildroot 3- make the changes your want: user@localhost ~ $ cd buildroot user@localhost ~ $ vim package/rpm/rpm.mk 4- now observe how that file has been modified: user@localhost ~ $ git status # On branch master # Changed but not updated: # (use "git add ..." to update what will be committed) # (use "git checkout -- ..." to discard changes in working directory) # # modified: package/rpm/rpm.mk # no changes added to commit (use "git add" and/or "git commit -a") user@localhost ~ $ git diff package/rpm/rpm.mk user@localhost ~ $ 5- now you need to add that modified file to the staging area: user@localhost ~ $ git add package/rpm/rpm.mk 6- now if you check the status again, you will see how that file has been added to the staging are in order to be committed: user@localhost ~ $ git status # On branch master # Changes to be committed: # (use "git reset HEAD ..." to unstage) # # modified: package/rpm/rpm.mk # 7- now you have to "commit", so all the changes to the files in the staging area (although you only have one file) will be committed. Also pass the "-s" option to the commit so your "Signed-off-by" will be added automatically taking the value from your ~/.gitconfig file: user@localhost ~ $ git commit -s A text editor should have opened and now you can write a title in the first line and a comment below the title, leaving one blank line between them. Please don't write lines longer than 72 characters (http://stackoverflow.com/questions/4297574/do-i-need-to-wrap-email-messages-longer-than-72-characters-in-a-line). 8- now you can see your commit on top of the log history. Run "git log" to see the entire log history paged, or just "git log -1" to see the most recent commit (which should be yours). This in an example of how it would look like: user@localhost ~ $ git log -1 commit 8eb4fddc0ff18b51fbcc5011f1d1d159e4169922 Author: Your Full Name Here Date: Tue Aug 25 10:28:47 2015 +0100 package/rpm: use the internal pcre when the external is not provided If the regular expression package pcre is enabled in buildroot, rpm will use it. If not, nothing will be used and regular expression are not available, making rpm unusable. But rpm has the ability to use an internal pcre implementation if the external lib is not available. This needs to be correctly activated before building and then rpm works fine on the target. Signed-off-by: Your Full Name Here user@localhost ~ $ 9- submit that commit by email using "git send-email", so it will format the patch automatically using "git format-patch" (again, this is an example of how it would look like): user@localhost ~ $ git send-email --to=buildroot@buildroot.org -1 /tmp/s5ZjTPKm7e/0001-package-rpm-use-the-internal-pcre-when-the-external-.patch Who should the emails appear to be from? [Your Full Name Here ] Emails will be sent from: Your Full Name Here Message-ID to be used as In-Reply-To for the first email? (mbox) Adding cc: Your Full Name Here from line 'From: Your Full Name Here ' (body) Adding cc: Your Full Name Here from line 'Signed-off-by: Your Full Name Here ' From: Your Full Name Here To: buildroot@buildroot.org Cc: Your Full Name Here Subject: [PATCH] package/rpm: use the internal pcre when the external is not provided Date: Tue, 25 Aug 2015 10:35:41 +0100 Message-Id: <1440495341-1861-1-git-send-email-your.email@address.here> X-Mailer: git-send-email 1.7.1 Send this email? ([y]es|[n]o|[q]uit|[a]ll): 10- check that information and if everything looks fine, then press "y" so the email will be sent using the stmp server you stated in your ~/.gitconfig file. Regards, Vincent. diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk index 7f346b2..05b98db 100644 --- a/package/rpm/rpm.mk +++ b/package/rpm/rpm.mk @@ -34,7 +34,7 @@ ifeq ($(BR2_PACKAGE_PCRE),y) RPM_DEPENDENCIES += pcre RPM_CONF_OPTS += --with-pcre=external else -RPM_CONF_OPTS += --with-pcre=none +RPM_CONF_OPTS += --with-pcre=internal endif ifeq ($(BR2_PACKAGE_FILE),y)